diff --git a/projects/syncthing/compose.yaml.mako b/projects/syncthing/compose.yaml.mako index 8290cc5..bc5c2a4 100644 --- a/projects/syncthing/compose.yaml.mako +++ b/projects/syncthing/compose.yaml.mako @@ -2,6 +2,7 @@ services: syncthing: container_name: syncthing image: docker.io/syncthing/syncthing:1 + network_mode: pasta:-a,${env['pasta']['syncthing']['ipv4']},-a,${env['pasta']['syncthing']['ipv6']} restart: always user: ${env['users']['syncthing']}:${env['users']['syncthing']} environment: @@ -14,7 +15,7 @@ services: volumes: - ${env['volumes']['syncthing']['datadir']}:/var/syncthing - stdiscosrv: + discosrv: container_name: syncthing-discosrv image: docker.io/syncthing/discosrv:1 restart: always @@ -23,14 +24,13 @@ services: environment: - PUID=${env['users']['syncthing_discosrv']} - PGID=${env['users']['syncthing_discosrv']} - networks: - - discosrv ports: - 127.0.0.1:${env['ports']['syncthing_discosrv']}:8443 - strelaysrv: + relaysrv: container_name: syncthing-relaysrv image: docker.io/syncthing/relaysrv:1 + network_mode: pasta:-a,${env['pasta']['syncthing_relaysrv']['ipv4']},-a,${env['pasta']['syncthing_relaysrv']['ipv6']} restart: always command: - '-ext-address=:${env['ports']["syncthing_relaysrv"]}' @@ -38,20 +38,10 @@ services: environment: - PUID=${env['users']['syncthing_relaysrv']} - PGID=${env['users']['syncthing_relaysrv']} - networks: - - relaysrv ports: - 22067:22067 volumes: - - strelaysrv:/var/strelaysrv - -networks: - default: - enable_ipv6: true - discosrv: - enable_ipv6: true - relaysrv: - enable_ipv6: true + - relaysrv:/var/strelaysrv volumes: - strelaysrv: + relaysrv: diff --git a/pyenv.yml b/pyenv.yml index 1b5239f..2c0deb8 100644 --- a/pyenv.yml +++ b/pyenv.yml @@ -38,6 +38,18 @@ certs: pkey: "/etc/letsencrypt/live/mail.viyurz.fr/privkey.pem" +pasta: + coturn: + ipv4: 10.86.3.1 + ipv6: fc86::3 + syncthing: + ipv4: 10.86.20.1 + ipv6: fc86::20 + syncthing_relaysrv: + ipv4: 10.86.21.1 + ipv6: fc86::21 + + # Ports exposed to host ports: coturn_listening: 3478