diff --git a/homelab/Caddyfile b/homelab/Caddyfile index 3bc3812..a5f170f 100644 --- a/homelab/Caddyfile +++ b/homelab/Caddyfile @@ -98,13 +98,6 @@ ancestry.woozle.org { } } - handle_path /wallart/* { - reverse_proxy { - to wallart:8080 - } - } - rewrite /public/wallart.bin /wallart/wallart.bin - handle_path /public/* { file_server { root /srv/storage/public diff --git a/homelab/deploy.sh b/homelab/deploy.sh index d329a08..75681bd 100755 --- a/homelab/deploy.sh +++ b/homelab/deploy.sh @@ -7,4 +7,4 @@ caddy_hash () { stack=$(basename $(pwd)) -docker stack deploy -c docker-compose.yaml --prune $stack +docker --context deergrove stack deploy -c docker-compose.yaml --prune $stack diff --git a/homelab/docker-compose.yaml b/homelab/docker-compose.yaml index 2c7b138..c0bcd73 100644 --- a/homelab/docker-compose.yaml +++ b/homelab/docker-compose.yaml @@ -174,13 +174,6 @@ services: target: /etc/localtime read_only: true - wallart: - image: git.woozle.org/neale/wallart-server - volumes: - - type: bind - source: /srv/sys/wallart - target: /cache - atlas: image: ctassisf/ripe-atlas-alpine:arm64v8 volumes: @@ -282,7 +275,7 @@ configs: name: Corefile-v2 Caddyfile: file: Caddyfile - name: Caddyfile-v79 + name: Caddyfile-v80 index.html: file: www/index.html name: index.html-v32 @@ -299,7 +292,7 @@ configs: secrets: passwd: file: secrets/passwd - name: passwd-v1 + name: passwd-v2 simpleauth.key: file: secrets/simpleauth.key name: simpleauth.key-v1 diff --git a/melville/Caddyfile b/melville/Caddyfile index 52ac534..3a2a369 100644 --- a/melville/Caddyfile +++ b/melville/Caddyfile @@ -21,6 +21,10 @@ www.woozle.org, woozle.org { root * /srv/www/woozle.org file_server + handle_path /wallart/* { + reverse_proxy wallart:8080 + } + handle_errors { @404 { expression {http.error.status_code} == 404 diff --git a/melville/docker-compose.yaml b/melville/docker-compose.yaml index 6f9e543..db1bc64 100644 --- a/melville/docker-compose.yaml +++ b/melville/docker-compose.yaml @@ -23,17 +23,12 @@ services: - source: Caddyfile target: /etc/caddy/Caddyfile - simpleauth: - image: zix99/simple-auth - environment: - SA_WEB_LOGIN_COOKIE_JWT_SIGNINGKEY: a-unqiue-signing-key - SA_VERBOSE: 'true' - SA_WEB_LOGIN_SETTINGS_ROUTEONLOGIN: "/" - SA_AUTHENTICATORS_VOUCH_ENABLED: 'true' + wallart: + image: git.woozle.org/neale/wallart-server volumes: - - type: volume - source: sadb - target: /var/lib/simple-auth + - type: bind + source: /srv/wallart + target: /cache vail: image: ghcr.io/nealey/vail:main @@ -41,4 +36,5 @@ services: configs: Caddyfile: file: Caddyfile - name: Caddyfile-v7 + name: Caddyfile-v9 +