diff --git a/readme.md b/readme.md index 802513e..71b7ad7 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,8 @@ One simple way is to allow unprivileged users access to these low ports - [x] caddy for homepage - [x] webdav for personal home pages -- [ ] authelia sso +- [?] authelia sso +- [x] mount caddy files from service compose files - [ ] backup using duplicity uploaded to backblaze b2 - [ ] restore using duplicity downloaded from backblaze b2 - [ ] ~~zitadel sso~~ diff --git a/services/authelia.yaml b/services/authelia.yaml index 5ad0e97..ce3ea7f 100644 --- a/services/authelia.yaml +++ b/services/authelia.yaml @@ -53,6 +53,10 @@ services: restart: no entrypoint: [ "/generate-secrets.sh", "/secrets" ] + caddy: + volumes: + - ./authelia/Proxyfile:/etc/caddy.d/authelia:ro + volumes: postgres-data: authelia-config: diff --git a/services/caddy.yaml b/services/caddy.yaml index 1bbf8b2..d803e37 100644 --- a/services/caddy.yaml +++ b/services/caddy.yaml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" services: caddy: diff --git a/services/caddy/Caddyfile b/services/caddy/Caddyfile index 72d8210..e0c29e7 100644 --- a/services/caddy/Caddyfile +++ b/services/caddy/Caddyfile @@ -4,10 +4,4 @@ } } -web.{$DOMAIN} { - reverse_proxy web:4431 -} - -login.{$DOMAIN} { - reverse_proxy authelia:9091 -} +import /etc/caddy.d/* diff --git a/services/authelia/generate-secrets.sh b/services/generate-secrets similarity index 100% rename from services/authelia/generate-secrets.sh rename to services/generate-secrets diff --git a/services/readme.md b/services/readme.md index 303c807..6d7b232 100644 --- a/services/readme.md +++ b/services/readme.md @@ -35,9 +35,21 @@ There are three things to think about when adding a service: Generally, zitadel has some cli commands that we have put in scripts in the zitadel folder. -2. How to expose as a subdomain in caddy? +2. How to expose as a subdomain? -You will want to make a Caddyfile, which will get mounted by the Caddy compose file. +Add a volume mount of your reverse proxy config to your compose file. + + + # in the services: part of your compose file + caddy: + volumes: + - ./some-service/Proxyfile:/etc/caddy.d/some-service + + # Proxyfile looks something like + someservice.{$DOMAIN} { + reverse_proxy someservice:4321 + } + 3. How will this be backed up and restored? diff --git a/services/web.yaml b/services/web.yaml index 170f5a7..cbc0972 100644 --- a/services/web.yaml +++ b/services/web.yaml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" services: web: @@ -18,5 +18,9 @@ services: environment: - DOMAIN + caddy: + volumes: + - ./web/Proxyfile:/etc/caddy.d/web:ro + volumes: caddy_config: