Improve docker-compose/traefik config

This commit is contained in:
Felix Ableitner 2019-06-03 23:18:10 +02:00
parent 0c33d181cd
commit a5d7c42f7b
2 changed files with 7 additions and 12 deletions

View file

@ -9,7 +9,7 @@ services:
- "80:80" # The HTTP port
- "443:443" # The HTTPS port
volumes:
- /var/run/docker.sock:/var/run/docker.sock # So that Traefik can listen to the Docker events
- /var/run/docker.sock:/var/run/docker.sock:ro
- ./volumes/traefik/acme.json:/etc/acme.json
- ./traefik.toml:/traefik.toml
depends_on:
@ -28,9 +28,9 @@ services:
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
labels:
traefik.enable: "true"
traefik.frontend.rule: "Host:${PEERTUBE_WEBSERVER_HOSTNAME}"
traefik.port: "9000"
- traefik.enable=true
- traefik.frontend.rule=Host:${PEERTUBE_WEBSERVER_HOSTNAME}
- traefik.port=9000
depends_on:
- peertube
restart: "always"

View file

@ -26,13 +26,6 @@ defaultEntryPoints = ["http", "https"]
"TLS_RSA_WITH_AES_256_GCM_SHA384",
"TLS_RSA_WITH_AES_256_CBC_SHA"
]
FrameDeny = false # here we don't want to deny frames since we have an embed
STSIncludeSubdomains = true
STSSeconds = 315360000
STSPreload = true
ContentTypeNosniff = true
BrowserXssFilter = true
# Enable ACME (Let's Encrypt): automatic SSL.
[acme]
@ -75,4 +68,6 @@ entryPoint = "https"
entryPoint = "http"
[docker]
exposedByDefault = false
endpoint = "unix:///var/run/docker.sock"
watch = true
exposedbydefault = false