readme typo

minor

.drone.yml

@@ -1,21 +0,0 @@
----
-kind: pipeline
-name: deploy to swarm-test.autonomic.zone
-steps:
-  - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
-    settings:
-      host: swarm-test.autonomic.zone
-      stack: traefik
-      deploy_key:
-        from_secret: drone_ssh_swarm_test
-    environment:
-      DOMAIN: traefik.swarm-test.autonomic.zone
-      STACK_NAME: traefik
-      LETS_ENCRYPT_ENV: production
-      LETS_ENCRYPT_EMAIL: helo@autonomic.zone
-      TRAEFIK_YML_VERSION: v3
-      FILE_PROVIDER_YML_VERSION: v2
-trigger:
-  branch:
-    - master

.env.sample

@@ -1,27 +0,0 @@
-TYPE=traefik
-
-DOMAIN=traefik.example.com
-LETS_ENCRYPT_ENV=production
-
-LETS_ENCRYPT_DISABLED=0
-LETS_ENCRYPT_EMAIL=certs@example.com
-# DASHBOARD_ENABLED=true
-# WARN, INFO etc.
-LOG_LEVEL=WARN
-
-## Enable Keycloak
-#COMPOSE_FILE="compose.yml:compose.keycloak.yml"
-#KEYCLOAK_MIDDLEWARE_ENABLED=1
-
-## SMTP port 587
-#COMPOSE_FILE="compose.yml:compose.smtp.yml"
-#SMTP_ENABLED=1
-
-## Gitea SSH
-# GITEA_SSH_ENABLED=1
-
-## Foodsoft SMTP
-# FOODSOFT_SMTP_ENABLED=1
-
-## Host-mode networking
-#COMPOSE_FILE="compose.yml:compose.host.yml"

.gitignore

@@ -1 +1 @@
-.envrc
+.env

README.md

@@ -1,26 +1,24 @@
 # Traefik
 
-[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/traefik/status.svg)](https://drone.autonomic.zone/coop-cloud/traefik)
+Wiki Cafe's configuration for a traefik deployment. Originally slimmed down from an `abra` [recipe](https://git.coopcloud.tech/coop-cloud/traefik) by [Co-op Cloud](https://coopcloud.tech/).
 
-> https://docs.traefik.io
 
-<!-- metadata -->
-* **Category**: Utilities
-* **Status**: ?
-* **Image**: [`traefik`](https://hub.docker.com/_/traefik), ❶💚, upstream
-* **Healthcheck**: Yes
-* **Backups**: No
-* **Email**: N/A
-* **Tests**: ❷💛
-* **SSO**: ? (Keycloak)
-<!-- endmetadata -->
+## Deploying the app with Docker Swarm
 
-## Basic usage
+Set the environment variables from the .env file during the shell session.
 
-1. Set up Docker Swarm and [`abra`]
-2. `abra app new traefik`
-3. `abra app YOURAPPDOMAIN config` - be sure to change `DOMAIN` to something that resolves to
-   your Docker swarm box
-4. `abra app YOURAPPDOMAIN deploy`
+```
+set -a && source .env && set +a
+```
 
-[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
+Set the secrets.
+
+```
+printf "SECRET_HERE" | docker secret create SECRET_NAME -
+```
+
+Deploy using the `-c` flag to specify multiple compose files.
+
+```
+docker stack deploy traefik -c compose.yaml -c compose.googledomains.yaml
+```

abra.sh

@@ -1,2 +0,0 @@
-export TRAEFIK_YML_VERSION=v7
-export FILE_PROVIDER_YML_VERSION=v1

compose.googledomains.yaml

@@ -0,0 +1,10 @@
+services:
+  app:
+    environment:
+      - GOOGLE_DOMAINS_ACCESS_TOKEN_FILE=/run/secrets/google_domains_access_token
+    secrets:
+      - google_domains_access_token
+
+secrets:
+  google_domains_access_token:
+    external: true

compose.host.yml

@@ -1,18 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    deploy:
-      update_config:
-        order: stop-first
-    ports:
-      - target: 80
-        published: 80
-        mode: host
-      - target: 443
-        published: 443
-        mode: host
-      - target: 2222
-        published: 2222
-        mode: host

compose.keycloak.yml

@@ -1,10 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    deploy:
-      labels:
-        - "traefik.http.routers.traefik.middlewares=keycloak@file"
-    environment:
-      - KEYCLOAK_MIDDLEWARE_ENABLED

compose.smtp.yml

@@ -1,7 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    ports:
-      - "587:587"

compose.yaml

@@ -1,36 +1,32 @@
-version: "3.8"
 services:
   app:
-    image: "traefik:v2.4.8"
+    image: "traefik:v2.10.4"
     ports:
+      # HTTP
       - "80:80"
+      # HTTPS
       - "443:443"
-      - "2222:2222"
-      - "2525:2525"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "letsencrypt:/etc/letsencrypt"
     configs:
-      - source: traefik_yml
-        target: /etc/traefik/traefik.yml
-      - source: file_provider_yml
-        target: /etc/traefik/file-provider.yml
+      - source: traefik_yaml
+        target: /etc/traefik/traefik.yaml
+      - source: file_provider_yaml
+        target: /etc/traefik/file-provider.yaml
     networks:
       - proxy
     environment:
       - DASHBOARD_ENABLED
-      - LETS_ENCRYPT_DISABLED
-      - LETS_ENCRYPT_EMAIL
-      - FOODSOFT_SMTP_ENABLED
-      - GITEA_SSH_ENABLED
       - LOG_LEVEL
-      - SMTP_ENABLED
+      - LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER
     healthcheck:
       test: ["CMD", "traefik", "healthcheck"]
       interval: 30s
       timeout: 10s
       retries: 10
       start_period: 1m
+    command: traefik
     deploy:
       update_config:
         failure_action: rollback
@@ -40,21 +36,21 @@ services:
         - "traefik.http.services.traefik.loadbalancer.server.port=web"
         - "traefik.http.routers.traefik.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.traefik.entrypoints=web-secure"
-          #- "traefik.http.routers.traefik.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "traefik.http.routers.traefik.tls.options=default@file"
+        - "traefik.http.routers.traefik.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.traefik.service=api@internal"
         - "traefik.http.routers.traefik.middlewares=security@file"
-        - coop-cloud.${STACK_NAME}.app.version=v2.4.8-d7d63b0d
+
 networks:
   proxy:
     external: true
+
 configs:
-  traefik_yml:
-    name: ${STACK_NAME}_traefik_yml_${TRAEFIK_YML_VERSION}
-    file: traefik.yml
+  traefik_yaml:
+    file: traefik.yaml.tmpl
     template_driver: golang
-  file_provider_yml:
-    name: ${STACK_NAME}_file_provider_yml_${FILE_PROVIDER_YML_VERSION}
-    file: file-provider.yml
+  file_provider_yaml:
+    file: file-provider.yaml.tmpl
+    template_driver: golang
+
 volumes:
-  letsencrypt:
+  letsencrypt:

file-provider.yaml.tmpl

@@ -1,14 +1,6 @@
 ---
 http:
   middlewares:
-    {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
-    keycloak:
-      forwardAuth:
-        address: "http://traefik-forward-auth:4181"
-        trustForwardHeader: true
-        authResponseHeaders:
-          - X-Forwarded-User
-    {{ end }}
     security:
       headers:
         frameDeny: true

renovate.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ]
-}

traefik.yaml.tmpl

@@ -9,7 +9,7 @@ providers:
     network: proxy
     swarmMode: true
   file:
-    filename: /etc/traefik/file-provider.yml
+    filename: /etc/traefik/file-provider.yaml
 
 api:
   dashboard: {{ env "DASHBOARD_ENABLED" }}
@@ -24,23 +24,10 @@ entrypoints:
           to: web-secure
   web-secure:
     address: ":443"
-  {{ if eq (env "GITEA_SSH_ENABLED") "1" }}
-  gitea-ssh:
-    address: ":2222"
-  {{ end }}
-  {{ if eq (env "FOODSOFT_SMTP_ENABLED") "1" }}
-  foodsoft-smtp:
-    address: ":2525"
-  {{ end }}
-  {{ if eq (env "SMTP_ENABLED") "1" }}
-  smtp-submission:
-    address: ":587"
-  {{ end }}
 
 ping:
   entryPoint: web
 
-{{ if not (eq (env "LETS_ENCRYPT_DISABLED") "1") }}
 certificatesResolvers:
   staging:
     acme:
@@ -49,10 +36,19 @@ certificatesResolvers:
       caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
       httpChallenge:
         entryPoint: web
+      dnsChallenge:
+        provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
+        resolvers:
+          - "1.1.1.1:53"
+          - "8.8.8.8:53"
   production:
     acme:
       email: {{ env "LETS_ENCRYPT_EMAIL" }}
       storage: /etc/letsencrypt/production-acme.json
       httpChallenge:
         entryPoint: web
-{{ end }}
+      dnsChallenge:
+        provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
+        resolvers:
+          - "1.1.1.1:53"
+          - "8.8.8.8:53"