diff --git a/roles/traefik-proxy-docker/files/traefik/data/traefik.toml b/roles/traefik-proxy-docker/files/traefik/data/traefik.toml index 0a65792..2d540bd 100644 --- a/roles/traefik-proxy-docker/files/traefik/data/traefik.toml +++ b/roles/traefik-proxy-docker/files/traefik/data/traefik.toml @@ -32,6 +32,7 @@ email = "letsencrypt.account@banditlair.com" storage = "acme.json" entryPoint = "https" OnHostRule = true +KeyType = "RSA4096" [acme.httpChallenge] entryPoint = "http" @@ -40,4 +41,4 @@ main = "banditlair.com" sans = ["mail.banditlair.com"] [accessLog] -filePath = "/var/log/traefik/access.log" \ No newline at end of file +filePath = "/var/log/traefik/access.log" diff --git a/roles/traefik-proxy-docker/files/traefik/docker-compose.yml b/roles/traefik-proxy-docker/files/traefik/docker-compose.yml index 7331e36..29a3928 100644 --- a/roles/traefik-proxy-docker/files/traefik/docker-compose.yml +++ b/roles/traefik-proxy-docker/files/traefik/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: traefik: container_name: traefik - image: traefik:1.6.0-rc6-alpine + image: traefik:1.7.12-alpine ports: - 80:80 - 443:443 @@ -24,26 +24,14 @@ services: - web restart: always - # Watch acme.json and dump certificates to files certdumper: - container_name: traefik_certdumper - image: alpine:latest + image: ldez/traefik-certs-dumper:v2.4.1 depends_on: - traefik restart: unless-stopped volumes: - ./certs:/traefik - command: > - ash -c " \ - apk --no-cache add inotify-tools jq openssl util-linux bash && \ - wget https://raw.githubusercontent.com/containous/traefik/master/contrib/scripts/dumpcerts.sh -O dumpcerts.sh && \ - mkdir -p /traefik/ssl/ && \ - while true; do \ - inotifywait -e modify /traefik/acme.json && \ - bash dumpcerts.sh /traefik/acme.json /traefik/ssl/ && \ - ln -f /traefik/ssl/certs/* /traefik/ssl/ && \ - ln -f /traefik/ssl/private/* /traefik/ssl/; \ - done" + command: file --source /traefik/acme.json --dest /traefik/ssl --watch networks: web: diff --git a/roles/traefik-proxy-docker/tasks/main.yml b/roles/traefik-proxy-docker/tasks/main.yml index 08bb2b3..ee31384 100644 --- a/roles/traefik-proxy-docker/tasks/main.yml +++ b/roles/traefik-proxy-docker/tasks/main.yml @@ -9,4 +9,4 @@ docker_network: name: web - name: Start traefik docker project - docker_service: project_src={{docker_compose_files_folder}}/traefik state=present \ No newline at end of file + docker_compose: project_src={{docker_compose_files_folder}}/traefik state=present