diff --git a/manuscript/recipes/duplicati.md b/manuscript/recipes/duplicati.md index f46f2f9..c9effa2 100644 --- a/manuscript/recipes/duplicati.md +++ b/manuscript/recipes/duplicati.md @@ -68,13 +68,22 @@ services: deploy: replicas: 1 labels: + # traefik common - traefik.enable=true + - traefik.docker.network=traefik_public + + # traefikv1 - traefik.frontend.rule=Host:duplicati.example.com - traefik.port=8200 - traefik.frontend.auth.forward.address=http://traefik-forward-auth:4181 - traefik.frontend.auth.forward.authResponseHeaders=X-Forwarded-User - traefik.frontend.auth.forward.trustForwardHeader=true - - traefik.docker.network=traefik_public + + # traefikv2 + - "traefik.http.routers.duplicati.rule=Host(`duplicati.example.com`)" + - "traefik.http.routers.duplicati.entrypoints=https" + - "traefik.http.services.duplicati.loadbalancer.server.port=8200" + - "traefik.http.routers.duplicati.middlewares=forward-auth" volumes: - /var/data/config/duplicati:/config - /var/data:/source @@ -114,4 +123,4 @@ Once we authenticate through the traefik-forward-auth provider, we can start con [^1]: Quote attributed to Mila Kunis [^2]: The [Duplicati 2 User's Manual](https://duplicati.readthedocs.io/en/latest/) contains all the information you'll need to configure backup endpoints, restore jobs, scheduling and advanced properties for your backup jobs. ---8<-- "recipe-footer.md" \ No newline at end of file +--8<-- "recipe-footer.md" diff --git a/manuscript/recipes/huginn.md b/manuscript/recipes/huginn.md index 502eab9..532d9bd 100644 --- a/manuscript/recipes/huginn.md +++ b/manuscript/recipes/huginn.md @@ -32,7 +32,7 @@ cat config/opendkim/keys/huginn.example.com/mail.txt ### Prepare environment -Create /var/data/huginn/huginn.env, and populate with the following variables. Set the "INVITATION_CODE" variable if you want to require users to enter a code to sign up (protects the UI from abuse) (The full list of Huginn environment variables is available [here](https://github.com/huginn/huginn/blob/master/.env.example)) +Create /var/data/config/huginn/huginn.env, and populate with the following variables. Set the "INVITATION_CODE" variable if you want to require users to enter a code to sign up (protects the UI from abuse) (The full list of Huginn environment variables is available [here](https://github.com/huginn/huginn/blob/master/.env.example)) ``` # For huginn/huginn - essential @@ -79,12 +79,21 @@ services: - /etc/localtime:/etc/localtime:ro networks: - internal - - traefik + - traefik_public deploy: labels: - - traefik.frontend.rule=Host:huginn.funkypenguin.co.nz - - traefik.docker.network=traefik - - traefik.port=3000 + # traefik common + - traefik.enable=true + - traefik.docker.network=traefik_public + + # traefikv1 + - traefik.frontend.rule=Host:huginn.example.com + - traefik.port=3000 + + # traefikv2 + - "traefik.http.routers.huginn.rule=Host(`huginn.example.com`)" + - "traefik.http.routers.huginn.entrypoints=https" + - "traefik.http.services.huginn.loadbalancer.server.port=3000" db: env_file: /var/data/config/huginn/huginn.env @@ -115,7 +124,7 @@ services: - internal networks: - traefik: + traefik_public: external: true internal: driver: overlay @@ -136,4 +145,4 @@ Log into your new instance at https://**YOUR-FQDN**. You'll need to use the "Sig [^1]: I initially considered putting an oauth proxy in front of Huginn, but since the invitation code logic prevents untrusted access, and since using a proxy would break oauth for features such as Twitter integration, I left it out. ---8<-- "recipe-footer.md" \ No newline at end of file +--8<-- "recipe-footer.md"