diff --git a/dankclaw/authentik/quadlet/authentik-outpost.container b/dankclaw/authentik/quadlet/authentik-outpost.container index 6463bab..d9206f8 100644 --- a/dankclaw/authentik/quadlet/authentik-outpost.container +++ b/dankclaw/authentik/quadlet/authentik-outpost.container @@ -32,7 +32,7 @@ Environment=AUTHENTIK_SECRET_KEY=${AUTHENTIK_SECRET_KEY} Environment=AUTHENTIK_HOST=https://auth.franksdank.cloud Environment=AUTHENTIK_INSECURE=false Environment=AUTHENTIK_TOKEN=${AUTHENTIK_OUTPOST_TOKEN} -Volume=/home/dank/authentik/data:/data +Volume=/home/dank/Containers/authentik/data:/data User=0:0 [Service] diff --git a/dankclaw/authentik/quadlet/authentik-postgres.container b/dankclaw/authentik/quadlet/authentik-postgres.container index cc5389e..8c623ba 100644 --- a/dankclaw/authentik/quadlet/authentik-postgres.container +++ b/dankclaw/authentik/quadlet/authentik-postgres.container @@ -20,7 +20,7 @@ EnvironmentFile=/home/dank/serverAppConfigs/dankclaw/.env Environment=POSTGRES_DB=authentik Environment=POSTGRES_USER=authentik Environment=POSTGRES_PASSWORD=${AUTHENTIK_PG_PASS} -Volume=/home/dank/authentik/postgres:/var/lib/postgresql/data +Volume=/home/dank/Containers/authentik/postgres:/var/lib/postgresql/data # Unquoted argv: this quadlet generator space-splits HealthCmd into the # healthcheck's argv array, so a quoted probe would arrive mangled (the old # `/bin/sh -c "pg_isready..."` form arrived as /bin/sh + broken args and diff --git a/dankclaw/authentik/quadlet/authentik-worker.container b/dankclaw/authentik/quadlet/authentik-worker.container index bc3033a..e3422a4 100644 --- a/dankclaw/authentik/quadlet/authentik-worker.container +++ b/dankclaw/authentik/quadlet/authentik-worker.container @@ -25,7 +25,7 @@ Environment=AUTHENTIK_POSTGRESQL__NAME=authentik Environment=AUTHENTIK_POSTGRESQL__USER=authentik Environment=AUTHENTIK_POSTGRESQL__PASSWORD=${AUTHENTIK_PG_PASS} Environment=AUTHENTIK_SECRET_KEY=${AUTHENTIK_SECRET_KEY} -Volume=/home/dank/authentik/data:/data +Volume=/home/dank/Containers/authentik/data:/data User=0:0 [Service] diff --git a/dankclaw/gitea/quadlet/gitea-postgres.container b/dankclaw/gitea/quadlet/gitea-postgres.container index 437ee8f..29c8c70 100644 --- a/dankclaw/gitea/quadlet/gitea-postgres.container +++ b/dankclaw/gitea/quadlet/gitea-postgres.container @@ -3,7 +3,7 @@ # Install path on dankclaw: ~/.config/containers/systemd/gitea-postgres.container # Unit name: gitea-postgres.service (podman 5.x drops the container- prefix) # -# The DB password lives in /opt/gitea/.env on the host (mode 0600). +# The DB password lives in /home/dank/Containers/gitea/env on the host (mode 0600). # This file holds no secrets. See serverAppConfigs-docs/Dankclaw/Gitea.md. # The [Service] EnvironmentFile= line lets systemd expand # ${GITEA_DB_PASSWORD} in the generated ExecStart. @@ -16,14 +16,14 @@ After=network.target ContainerName=gitea-postgres Network=gitea.network Image=docker.io/library/postgres:16-alpine -EnvironmentFile=/opt/gitea/.env +EnvironmentFile=/home/dank/Containers/gitea/env Environment=POSTGRES_USER=gitea Environment=POSTGRES_PASSWORD=${GITEA_DB_PASSWORD} Environment=POSTGRES_DB=gitea -Volume=/opt/gitea/data/gitea-postgres:/var/lib/postgresql/data +Volume=/home/dank/Containers/gitea/postgres:/var/lib/postgresql/data [Service] -EnvironmentFile=/opt/gitea/.env +EnvironmentFile=/home/dank/Containers/gitea/env TimeoutStartSec=900 Restart=always diff --git a/dankclaw/gitea/quadlet/gitea-server.container b/dankclaw/gitea/quadlet/gitea-server.container index 1444bc2..940cc3b 100644 --- a/dankclaw/gitea/quadlet/gitea-server.container +++ b/dankclaw/gitea/quadlet/gitea-server.container @@ -5,7 +5,7 @@ # # The [Service] EnvironmentFile= line lets systemd expand # ${GITEA_DB_PASSWORD} in the generated ExecStart. -# The DB password lives in /opt/gitea/.env on the host (mode 0600). +# The DB password lives in /home/dank/Containers/gitea/env on the host (mode 0600). # This file holds no secrets. See serverAppConfigs-docs/Dankclaw/Gitea.md. # # Ports (live): 3000 = HTTP UI/API, 2222 = git SSH. The docs table in @@ -20,7 +20,7 @@ After=gitea-postgres.service network.target ContainerName=gitea-server Network=gitea.network Image=docker.io/gitea/gitea:latest -EnvironmentFile=/opt/gitea/.env +EnvironmentFile=/home/dank/Containers/gitea/env Environment=DATABASE_TYPE=postgres Environment=DATABASE_HOST=gitea-postgres Environment=DATABASE_NAME=gitea @@ -31,12 +31,12 @@ Environment=USER_UID=1000 Environment=USER_GID=1000 PublishPort=0.0.0.0:3000:3000 PublishPort=2222:22 -Volume=/opt/gitea/data/gitea-gitea:/data +Volume=/home/dank/Containers/gitea/data:/data Volume=/etc/timezone:/etc/timezone:ro Volume=/etc/localtime:/etc/localtime:ro [Service] -EnvironmentFile=/opt/gitea/.env +EnvironmentFile=/home/dank/Containers/gitea/env TimeoutStartSec=900 Restart=always diff --git a/dankclaw/hermes/quadlet/hermes-dashboard.container b/dankclaw/hermes/quadlet/hermes-dashboard.container index f6adbd7..cc2e7a2 100644 --- a/dankclaw/hermes/quadlet/hermes-dashboard.container +++ b/dankclaw/hermes/quadlet/hermes-dashboard.container @@ -19,7 +19,7 @@ Pull=never Network=dankclaw_default Environment=HERMES_DATA_DIR=/data Environment=HERMES_HOME=/data -Volume=/home/dank/hermes-data:/data +Volume=/home/dank/Containers/hermes/data:/data PublishPort=9119:9119 Exec=bash -c 'hermes dashboard --host 0.0.0.0 --port 9119 --no-open --skip-build' diff --git a/dankclaw/hermes/quadlet/hermes-webui.container b/dankclaw/hermes/quadlet/hermes-webui.container index fe96860..e7e587d 100644 --- a/dankclaw/hermes/quadlet/hermes-webui.container +++ b/dankclaw/hermes/quadlet/hermes-webui.container @@ -33,8 +33,8 @@ Environment=HERMES_WEBUI_PASSWORD=${HERMES_WEBUI_PASSWORD} # Headless host: never show the first-run wizard (a profile already # exists in /data from the gateway). Environment=HERMES_WEBUI_SKIP_ONBOARDING=1 -Volume=/home/dank/hermes-data:/data -Volume=/home/dank/hermes-webui:/webui +Volume=/home/dank/Containers/hermes/data:/data +Volume=/home/dank/Containers/hermes/webui:/webui Exec=python3 /webui/bootstrap.py --foreground # JSON exec form on purpose: this quadlet generator joins a bare HealthCmd # into ONE argv element with \x20 escapes and then shell-executes it — the diff --git a/dankclaw/hermes/quadlet/hermes.container b/dankclaw/hermes/quadlet/hermes.container index 4db8f55..9e1f782 100644 --- a/dankclaw/hermes/quadlet/hermes.container +++ b/dankclaw/hermes/quadlet/hermes.container @@ -33,7 +33,7 @@ Environment=HERMES_HOME=/data Environment=SIGNAL_HTTP_URL=http://127.0.0.1:8080 Environment=SIGNAL_ACCOUNT=${SIGNAL_ACCOUNT} Environment=SIGNAL_ALLOWED_USERS=${SIGNAL_ALLOWED_USERS} -Volume=/home/dank/hermes-data:/data +Volume=/home/dank/Containers/hermes/data:/data Exec=bash -c 'hermes gateway run --force -v' [Service]