move config into single file

This commit is contained in:
paul 2017-07-09 20:42:15 +02:00 committed by Hive
parent 400161f724
commit c3ff9aeffc
5 changed files with 47 additions and 35 deletions

2
cert/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
# ignore the generated certificates
acme.json

View file

View file

@ -1,26 +0,0 @@
# new domains and subdomains can be configured here, the file is read
# automatically after modification.
#
# note that domains and subdomains not defined in this file will still work
# when defined in a container Host-Rule. However, they will generate
# their own ACME request, and will count towards LetsEncrypt's rate limit.
#[acme]
#email = "hostmaster@zom.bi"
#storage = "cert/acme.json"
#entryPoint = "https"
#onDemand = false
#OnHostRule = true
#
#[[acme.domains]]
# main = "zom.bi"
# sans = [
# "blog.zom.bi",
# "www.zom.bi",
# ]
# You can define multiple of these blocks, each of which will result in one
# certificate.
#[[acme.domains]]
# main = "zombi.systems"
# sans = ["www.zombi.systems", "blog.zombi.systems"]

View file

@ -3,6 +3,13 @@ InsecureSkipVerify = true
defaultEntryPoints = ["http", "https"]
[acme]
email = "hostmaster@zom.bi"
storage = "cert/acme.json"
entryPoint = "https"
onDemand = false
OnHostRule = true
[entryPoints]
[entryPoints.http]
address = ":80"
@ -21,12 +28,41 @@ domain = "docker.localhost"
watch = true
exposedbydefault = false
# embed acme configuration.
# new domains and subdomains can be configured here, the file is read
# automatically after modification.
# new domains and subdomains can be configured here.
# note that domains and subdomains not defined in this file will still work,
# when defined in a container Host-Rule. However, they will generate
# their own ACME request, and will count towards LetsEncrypt's rate limit.
[file]
filename = "acme.toml"
watch = true
[[acme.domains]]
main = "zom.bi"
sans = [
"conference.zom.bi",
"talk.zom.bi",
"mumble.zom.bi",
"irc.zom.bi",
"mx.zom.bi",
"user.zom.bi",
"xmpp.zom.bi",
# web vhosts:
"api.zom.bi",
"autoconfig.zom.bi",
"blog.zom.bi",
"download.zom.bi",
"git.zom.bi",
"kanban.zom.bi",
"mail.zom.bi",
"music.zom.bi",
"org.zom.bi",
"push.zom.bi",
"static.zom.bi",
"stream.zom.bi",
"tube.zom.bi",
"wiki.zom.bi",
"www.zom.bi",
]
# You can define multiple of these blocks, each of which will result in one
# certificate.
#[[acme.domains]]
# main = "zombi.systems"
# sans = ["www.zombi.systems", "blog.zombi.systems"]

View file

@ -4,20 +4,20 @@ services:
proxy:
image: traefik
command: --logLevel=INFO
networks:
- "webgateway"
ports:
- "80:80"
- "443:443"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
- "./cert/:/cert/"
- "./traefik.toml:/traefik.toml:ro"
- "./config/:/etc/traefik/:ro"
labels:
- "traefik.enable=false" # set to true to expose the Monitoring & API
- "traefik.backend=proxy"
- "traefik.port=8080"
- "traefik.frontend.rule=Host: api.zom.bi"
networks:
- "web"
networks:
web: