From 04a10bc1e10c49ab63c270a0558dd53440e1e3fe Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sat, 25 Apr 2020 12:51:44 +0200
Subject: [PATCH] More hacking towards a working install

---
 docker-compose.yml | 10 +++++++++-
 traefik.yml        |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9df46bc..c7bae41 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,11 +18,19 @@ services:
     networks:
       - proxy
     deploy:
+      placement:
+        constraints:
+          - node.role == manager
       labels:
         - "traefik.enable=true"
+        - "traefik.http.services.traefik.loadbalancer.server.port=8080"
         - "traefik.http.routers.traefik.rule=Host(`traefik.swarm.autonomic.zone`)"
-        - "traefik.http.routers.traefik.tls=true"
+        - "traefik.http.routers.traefik.entrypoints=web-secured"
         - "traefik.http.routers.traefik.tls.certresolver=staging"
+        - "traefik.http.routers.traefik.service=api@internal"
+        # use docker secrets once things get stable
+        - "traefik.http.routers.traefik.middlewares=traefik-auth"
+        - "traefik.http.middlewares.traefik-auth.basicauth.users=autonomic:autonomic"
 
 networks:
   proxy:
diff --git a/traefik.yml b/traefik.yml
index 4b43959..66ce478 100644
--- a/traefik.yml
+++ b/traefik.yml
@@ -28,7 +28,7 @@ certificatesResolvers:
   staging:
     acme:
       email: "helo@autonomic.zone"
-      storage: "/letsencrypt/acme.json"
+      storage: "/etc/letsencrypt/acme.json"
       caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
       httpChallenge:
         entryPoint: "web"