Compare commits

..

1 Commits

Author SHA1 Message Date
1a45317173 Make chats use vlan-DMZ net via macvlan 2024-01-20 22:46:34 +03:00

View File

@ -11,19 +11,13 @@ services:
- ./ssh-chat/motd:/motd:ro - ./ssh-chat/motd:/motd:ro
- ./ssh-chat/admins:/admins:ro - ./ssh-chat/admins:/admins:ro
command: "/usr/local/bin/ssh-chat --identity /run/secrets/chatkey --admin=/admins --log=/dev/stdout --motd=/motd" command: "/usr/local/bin/ssh-chat --identity /run/secrets/chatkey --admin=/admins --log=/dev/stdout --motd=/motd"
read_only: true networks:
vlan-DMZ:
deploy: ipv4_address: 10.5.0.10
resources:
limits:
cpus: '0.1'
memory: '64M'
pids: 20
matterbridge: matterbridge:
image: docker.io/42wim/matterbridge:stable build: https://gitea.demb.uk/third-party-mirrors/matterbridge.git#v1.26.0
restart: unless-stopped restart: unless-stopped
read_only: true
user: nobody user: nobody
volumes: volumes:
- ./matterbridge/matterbridge.toml:/etc/matterbridge/matterbridge.toml:ro - ./matterbridge/matterbridge.toml:/etc/matterbridge/matterbridge.toml:ro
@ -31,32 +25,23 @@ services:
- MATTERBRIDGE_DISCORD_MYDISCORD_TOKEN # Expected to be found in ./.env - MATTERBRIDGE_DISCORD_MYDISCORD_TOKEN # Expected to be found in ./.env
depends_on: depends_on:
- ssh-chat - ssh-chat
networks:
deploy: vlan-DMZ:
resources:
limits:
cpus: '0.1'
memory: '64M'
pids: 20
ts3: ts3:
image: docker.io/teamspeak:3.13.7 image: docker.io/teamspeak:3.13.7
restart: unless-stopped restart: unless-stopped
ports: ports:
- 9987:9987/udp - 9987:9987/udp
- 10011:10011 # Not forwarded on the router so not forwarding here # - 10011:10011 # Not forwarded on the router so not forwarding here
- 30033:30033 - 30033:30033
environment: environment:
TS3SERVER_LICENSE: accept TS3SERVER_LICENSE: accept
volumes: volumes:
- ts3-vol:/var/ts3server - ts3-vol:/var/ts3server
networks:
deploy: vlan-DMZ:
resources: ipv4_address: 10.5.0.11
limits:
cpus: '0.25'
memory: '128M'
pids: 50
volumes: volumes:
ts3-vol: ts3-vol:
@ -65,3 +50,8 @@ volumes:
secrets: secrets:
chatkey: chatkey:
file: ./id_ed25516 file: ./id_ed25516
networks:
vlan-DMZ:
external: true