Compare commits
No commits in common. "c03d3e52ce4ca0297271bb5a674bf621b562758c" and "fe2f97232c42f152c8d489e713bc9cf1e5dd27e3" have entirely different histories.
c03d3e52ce
...
fe2f97232c
3 changed files with 20 additions and 19 deletions
|
@ -2,7 +2,6 @@ services:
|
||||||
coturn:
|
coturn:
|
||||||
container_name: coturn
|
container_name: coturn
|
||||||
image: docker.io/coturn/coturn:4-alpine
|
image: docker.io/coturn/coturn:4-alpine
|
||||||
network_mode: pasta:-a,${env['pasta']['coturn']['ipv4']},-a,${env['pasta']['coturn']['ipv6']}
|
|
||||||
restart: always
|
restart: always
|
||||||
user: ${env['users']['coturn']}:${env['users']['coturn']}
|
user: ${env['users']['coturn']}:${env['users']['coturn']}
|
||||||
ports:
|
ports:
|
||||||
|
@ -17,3 +16,7 @@ services:
|
||||||
- ./turnserver.conf.rendered:/etc/coturn/turnserver.conf:ro
|
- ./turnserver.conf.rendered:/etc/coturn/turnserver.conf:ro
|
||||||
- ${env['certs']['coturn']['cert']}:/etc/coturn/cert.pem:ro
|
- ${env['certs']['coturn']['cert']}:/etc/coturn/cert.pem:ro
|
||||||
- ${env['certs']['coturn']['pkey']}:/etc/coturn/pkey.pem:ro
|
- ${env['certs']['coturn']['pkey']}:/etc/coturn/pkey.pem:ro
|
||||||
|
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
|
enable_ipv6: true
|
||||||
|
|
|
@ -2,7 +2,6 @@ services:
|
||||||
syncthing:
|
syncthing:
|
||||||
container_name: syncthing
|
container_name: syncthing
|
||||||
image: docker.io/syncthing/syncthing:1
|
image: docker.io/syncthing/syncthing:1
|
||||||
network_mode: pasta:-a,${env['pasta']['syncthing']['ipv4']},-a,${env['pasta']['syncthing']['ipv6']}
|
|
||||||
restart: always
|
restart: always
|
||||||
user: ${env['users']['syncthing']}:${env['users']['syncthing']}
|
user: ${env['users']['syncthing']}:${env['users']['syncthing']}
|
||||||
environment:
|
environment:
|
||||||
|
@ -15,7 +14,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ${env['volumes']['syncthing']['datadir']}:/var/syncthing
|
- ${env['volumes']['syncthing']['datadir']}:/var/syncthing
|
||||||
|
|
||||||
discosrv:
|
stdiscosrv:
|
||||||
container_name: syncthing-discosrv
|
container_name: syncthing-discosrv
|
||||||
image: docker.io/syncthing/discosrv:1
|
image: docker.io/syncthing/discosrv:1
|
||||||
restart: always
|
restart: always
|
||||||
|
@ -24,13 +23,14 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID=${env['users']['syncthing_discosrv']}
|
- PUID=${env['users']['syncthing_discosrv']}
|
||||||
- PGID=${env['users']['syncthing_discosrv']}
|
- PGID=${env['users']['syncthing_discosrv']}
|
||||||
|
networks:
|
||||||
|
- discosrv
|
||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:${env['ports']['syncthing_discosrv']}:8443
|
- 127.0.0.1:${env['ports']['syncthing_discosrv']}:8443
|
||||||
|
|
||||||
relaysrv:
|
strelaysrv:
|
||||||
container_name: syncthing-relaysrv
|
container_name: syncthing-relaysrv
|
||||||
image: docker.io/syncthing/relaysrv:1
|
image: docker.io/syncthing/relaysrv:1
|
||||||
network_mode: pasta:-a,${env['pasta']['syncthing_relaysrv']['ipv4']},-a,${env['pasta']['syncthing_relaysrv']['ipv6']}
|
|
||||||
restart: always
|
restart: always
|
||||||
command:
|
command:
|
||||||
- '-ext-address=:${env['ports']["syncthing_relaysrv"]}'
|
- '-ext-address=:${env['ports']["syncthing_relaysrv"]}'
|
||||||
|
@ -38,10 +38,20 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- PUID=${env['users']['syncthing_relaysrv']}
|
- PUID=${env['users']['syncthing_relaysrv']}
|
||||||
- PGID=${env['users']['syncthing_relaysrv']}
|
- PGID=${env['users']['syncthing_relaysrv']}
|
||||||
|
networks:
|
||||||
|
- relaysrv
|
||||||
ports:
|
ports:
|
||||||
- 22067:22067
|
- 22067:22067
|
||||||
volumes:
|
volumes:
|
||||||
- relaysrv:/var/strelaysrv
|
- strelaysrv:/var/strelaysrv
|
||||||
|
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
|
enable_ipv6: true
|
||||||
|
discosrv:
|
||||||
|
enable_ipv6: true
|
||||||
|
relaysrv:
|
||||||
|
enable_ipv6: true
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
relaysrv:
|
strelaysrv:
|
||||||
|
|
12
pyenv.yml
12
pyenv.yml
|
@ -38,18 +38,6 @@ certs:
|
||||||
pkey: "/etc/letsencrypt/live/mail.viyurz.fr/privkey.pem"
|
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 exposed to host
|
||||||
ports:
|
ports:
|
||||||
coturn_listening: 3478
|
coturn_listening: 3478
|
||||||
|
|
Loading…
Reference in a new issue