diff --git a/compose.lib.yaml b/compose.lib.yaml index e5a6ecb..c74a7aa 100644 --- a/compose.lib.yaml +++ b/compose.lib.yaml @@ -1,7 +1,7 @@ services: app: volumes: - - "fedwiki_lib:/home/node/lib" + - "lib:/home/node/lib" volumes: - fedwiki_lib: + lib: diff --git a/compose.yaml b/compose.yaml index 330f951..f5873ee 100644 --- a/compose.yaml +++ b/compose.yaml @@ -3,7 +3,7 @@ services: image: dobbs/farm:1.0.20 command: /bin/sh entrypoint.sh volumes: - - "fedwiki_data:/home/node/.wiki" + - "data:/home/node/.wiki" networks: - proxy configs: @@ -32,6 +32,9 @@ services: - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}" - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}" - "traefik.http.routers.${STACK_NAME}.priority=1" + - "traefik.http.routers.${STACK_NAME}_auth.rule=(Host(`${DOMAIN}`) && (PathPrefix(`/auth`) || Path(`/security/dialog.css`)))" + - "traefik.http.routers.${STACK_NAME}_auth.entrypoints=web-secure" + - "traefik.http.routers.${STACK_NAME}_auth.tls.certresolver=${LETS_ENCRYPT_ENV}" - "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}" - "caddy.reverse_proxy={{upstreams 3000}}" - "caddy.tls.on_demand=" @@ -47,7 +50,7 @@ process.exit(1); }); request.end();'" start_period: 30s volumes: - fedwiki_data: + data: networks: proxy: