Move wallart

This commit is contained in:
Neale Pickett 2023-01-06 13:43:24 -07:00
parent 59297a1a33
commit b54e137b2e
5 changed files with 14 additions and 28 deletions

View File

@ -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/* { handle_path /public/* {
file_server { file_server {
root /srv/storage/public root /srv/storage/public

View File

@ -7,4 +7,4 @@ caddy_hash () {
stack=$(basename $(pwd)) stack=$(basename $(pwd))
docker stack deploy -c docker-compose.yaml --prune $stack docker --context deergrove stack deploy -c docker-compose.yaml --prune $stack

View File

@ -174,13 +174,6 @@ services:
target: /etc/localtime target: /etc/localtime
read_only: true read_only: true
wallart:
image: git.woozle.org/neale/wallart-server
volumes:
- type: bind
source: /srv/sys/wallart
target: /cache
atlas: atlas:
image: ctassisf/ripe-atlas-alpine:arm64v8 image: ctassisf/ripe-atlas-alpine:arm64v8
volumes: volumes:
@ -282,7 +275,7 @@ configs:
name: Corefile-v2 name: Corefile-v2
Caddyfile: Caddyfile:
file: Caddyfile file: Caddyfile
name: Caddyfile-v79 name: Caddyfile-v80
index.html: index.html:
file: www/index.html file: www/index.html
name: index.html-v32 name: index.html-v32
@ -299,7 +292,7 @@ configs:
secrets: secrets:
passwd: passwd:
file: secrets/passwd file: secrets/passwd
name: passwd-v1 name: passwd-v2
simpleauth.key: simpleauth.key:
file: secrets/simpleauth.key file: secrets/simpleauth.key
name: simpleauth.key-v1 name: simpleauth.key-v1

View File

@ -21,6 +21,10 @@ www.woozle.org, woozle.org {
root * /srv/www/woozle.org root * /srv/www/woozle.org
file_server file_server
handle_path /wallart/* {
reverse_proxy wallart:8080
}
handle_errors { handle_errors {
@404 { @404 {
expression {http.error.status_code} == 404 expression {http.error.status_code} == 404

View File

@ -23,17 +23,12 @@ services:
- source: Caddyfile - source: Caddyfile
target: /etc/caddy/Caddyfile target: /etc/caddy/Caddyfile
simpleauth: wallart:
image: zix99/simple-auth image: git.woozle.org/neale/wallart-server
environment:
SA_WEB_LOGIN_COOKIE_JWT_SIGNINGKEY: a-unqiue-signing-key
SA_VERBOSE: 'true'
SA_WEB_LOGIN_SETTINGS_ROUTEONLOGIN: "/"
SA_AUTHENTICATORS_VOUCH_ENABLED: 'true'
volumes: volumes:
- type: volume - type: bind
source: sadb source: /srv/wallart
target: /var/lib/simple-auth target: /cache
vail: vail:
image: ghcr.io/nealey/vail:main image: ghcr.io/nealey/vail:main
@ -41,4 +36,5 @@ services:
configs: configs:
Caddyfile: Caddyfile:
file: Caddyfile file: Caddyfile
name: Caddyfile-v7 name: Caddyfile-v9