diff --git a/beeper/etc/containers/systemd/aode/aode-relay.container b/beeper/etc/containers/systemd/aode/aode-relay.container index 7ef2dbe..0403e25 100644 --- a/beeper/etc/containers/systemd/aode/aode-relay.container +++ b/beeper/etc/containers/systemd/aode/aode-relay.container @@ -7,7 +7,7 @@ ContainerName=aode-relay EnvironmentFile=/etc/containers/systemd/aode/.env.secrets EnvironmentFile=/etc/containers/systemd/aode/.env PublishPort=127.0.0.1:19438:8080 -Volume=/var/containers/aode/relay:/db:Z +Volume=/var/containers/aode/data:/db:Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/ask-js/ask-js.container b/beeper/etc/containers/systemd/ask-js/ask-js.container index 7749725..f1db162 100644 --- a/beeper/etc/containers/systemd/ask-js/ask-js.container +++ b/beeper/etc/containers/systemd/ask-js/ask-js.container @@ -9,7 +9,7 @@ ContainerName=ask-js Network=ask-js.network Network=postgresql.network PublishPort=127.0.0.1:20617:3579 -Volume=/var/containers/ask-js/config.json:/app/config/config.json:ro,Z +Volume=/var/containers/ask-js/config:/app/config:ro,Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/caddy/caddy.container b/beeper/etc/containers/systemd/caddy/caddy.container index 4dfa345..0257690 100644 --- a/beeper/etc/containers/systemd/caddy/caddy.container +++ b/beeper/etc/containers/systemd/caddy/caddy.container @@ -7,8 +7,8 @@ AddCapability=NET_ADMIN Image=ghcr.io/zenfyrdev/caddy:latest Network=host Volume=/etc/caddy:/etc/caddy:z -Volume=/var/containers/caddy/caddy_config:/config:z -Volume=/var/containers/caddy/caddy_data:/data:z +Volume=/var/containers/caddy/config:/config:z +Volume=/var/containers/caddy/data:/data:z Volume=/var/log/caddy:/var/log/caddy:z Volume=/var/www:/var/www:z diff --git a/beeper/etc/containers/systemd/copyparty/copyparty.container b/beeper/etc/containers/systemd/copyparty/copyparty.container index 566e9bc..d6ab036 100644 --- a/beeper/etc/containers/systemd/copyparty/copyparty.container +++ b/beeper/etc/containers/systemd/copyparty/copyparty.container @@ -12,7 +12,7 @@ HealthTimeout=2s HealthRetries=5 PublishPort=127.0.0.1:15084:3923 UserNS=keep-id:uid=1000,gid=1000 -Volume=/var/containers/copyparty/conf:/cfg:Z +Volume=/var/containers/copyparty/config:/cfg:Z Volume=/mnt/ext/copyparty:/w:z [Service] diff --git a/beeper/etc/containers/systemd/ejabberd/ejabberd.container b/beeper/etc/containers/systemd/ejabberd/ejabberd.container index 4a4553e..ebcd227 100644 --- a/beeper/etc/containers/systemd/ejabberd/ejabberd.container +++ b/beeper/etc/containers/systemd/ejabberd/ejabberd.container @@ -17,9 +17,9 @@ PublishPort=5270:5270 PublishPort=5280:5280 PublishPort=5443:5443 PublishPort=5478:5478 -Volume=/var/containers/ejabberd/ejabberd.yml:/opt/ejabberd/conf/ejabberd.yml:ro,Z +Volume=/var/containers/ejabberd/config:/opt/ejabberd/conf:ro,Z Volume=/var/containers/ejabberd/files:/opt/ejabberd/upload:Z -Volume=/var/containers/ejabberd/db:/opt/ejabberd/database:Z +Volume=/var/containers/ejabberd/database:/opt/ejabberd/database:Z Volume=/etc/certs:/etc/letsencrypt/live:ro,z [Service] diff --git a/beeper/etc/containers/systemd/forgejo/forgejo-runner.container b/beeper/etc/containers/systemd/forgejo/forgejo-runner.container index 9b3ea37..51b0b95 100644 --- a/beeper/etc/containers/systemd/forgejo/forgejo-runner.container +++ b/beeper/etc/containers/systemd/forgejo/forgejo-runner.container @@ -10,7 +10,7 @@ EnvironmentFile=/etc/containers/systemd/forgejo/.env.runner Network=forgejo.network User=1001:1001 Exec=/bin/sh -c "sleep 5; forgejo-runner daemon" -Volume=/var/containers/forgejo/runner:/data:Z +Volume=/var/containers/forgejo/runner/data:/data:Z Volume=/var/run/dind/docker.sock:/var/run/docker.sock:z [Service] diff --git a/beeper/etc/containers/systemd/forgejo/forgejo.container b/beeper/etc/containers/systemd/forgejo/forgejo.container index dd4c760..1c4aefc 100644 --- a/beeper/etc/containers/systemd/forgejo/forgejo.container +++ b/beeper/etc/containers/systemd/forgejo/forgejo.container @@ -12,7 +12,7 @@ Network=postgresql.network PublishPort=127.0.0.1:41807:3000 PublishPort=10429:22 Timezone=local -Volume=/var/containers/forgejo/forgejo:/data:Z +Volume=/var/containers/forgejo/data:/data:Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/knot/knot.container b/beeper/etc/containers/systemd/knot/knot.container index b9a62a4..9965224 100644 --- a/beeper/etc/containers/systemd/knot/knot.container +++ b/beeper/etc/containers/systemd/knot/knot.container @@ -9,7 +9,7 @@ PublishPort=127.0.0.1:44131:5555 PublishPort=20564:22 Volume=/var/containers/knot/keys:/etc/ssh/keys:Z Volume=/var/containers/knot/repositories:/home/git/repositories:Z -Volume=/var/containers/knot/server:/app:Z +Volume=/var/containers/knot/data:/app:Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/mailserver/mailserver.container b/beeper/etc/containers/systemd/mailserver/mailserver.container index 026ffa6..486d8c0 100644 --- a/beeper/etc/containers/systemd/mailserver/mailserver.container +++ b/beeper/etc/containers/systemd/mailserver/mailserver.container @@ -4,7 +4,8 @@ Description=mailserver [Container] Image=ghcr.io/docker-mailserver/docker-mailserver:edge ContainerName=mailserver -EnvironmentFile=/etc/containers/systemd/mailserver/mailserver.env +EnvironmentFile=/etc/containers/systemd/mailserver/.env.secrets +EnvironmentFile=/etc/containers/systemd/mailserver/.env AddCapability=NET_ADMIN HealthCmd=ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1 HealthInterval=10s diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container index d6dde0a..c42aba7 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container @@ -14,7 +14,7 @@ HealthCmd=redis-cli ping HealthInterval=5s HealthRetries=20 Network=mastodon.network -Volume=/var/containers/mastodon/dragonfly:/data:z +Volume=/var/containers/mastodon/dragonfly:/data:Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/pds/pds.container b/beeper/etc/containers/systemd/pds/pds.container index 166720a..0bada32 100644 --- a/beeper/etc/containers/systemd/pds/pds.container +++ b/beeper/etc/containers/systemd/pds/pds.container @@ -7,7 +7,7 @@ ContainerName=pds EnvironmentFile=/etc/containers/systemd/pds/.env.secrets EnvironmentFile=/etc/containers/systemd/pds/.env PublishPort=127.0.0.1:24318:3000 -Volume=pds.volume:/pds +Volume=/var/containers/pds/data:/pds:Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/pds/pds.volume b/beeper/etc/containers/systemd/pds/pds.volume deleted file mode 100644 index bb4286a..0000000 --- a/beeper/etc/containers/systemd/pds/pds.volume +++ /dev/null @@ -1,2 +0,0 @@ -[Volume] -VolumeName=pds diff --git a/beeper/etc/containers/systemd/postgresql/postgresql.container b/beeper/etc/containers/systemd/postgresql/postgresql.container index 31c2aa4..ce3733d 100644 --- a/beeper/etc/containers/systemd/postgresql/postgresql.container +++ b/beeper/etc/containers/systemd/postgresql/postgresql.container @@ -11,7 +11,7 @@ HealthInterval=40s HealthTimeout=3s HealthRetries=20 UserNS=keep-id:uid=999,gid=999 -Volume=/var/containers/postgresql/db:/var/lib/postgresql/data:Z +Volume=/var/containers/postgresql/data:/var/lib/postgresql/data:Z Volume=/var/containers/postgresql/exp:/mnt/exp:Z [Service] diff --git a/beeper/etc/containers/systemd/searxng/searxng-dfdb.container b/beeper/etc/containers/systemd/searxng/searxng-dfdb.container index a921b64..3680359 100644 --- a/beeper/etc/containers/systemd/searxng/searxng-dfdb.container +++ b/beeper/etc/containers/systemd/searxng/searxng-dfdb.container @@ -14,7 +14,7 @@ HealthCmd=redis-cli ping HealthInterval=5s HealthRetries=20 Network=searxng.network -Volume=/var/containers/searxng/dragonfly:/data:z +Volume=/var/containers/searxng/dragonfly:/data:Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/searxng/searxng.container b/beeper/etc/containers/systemd/searxng/searxng.container index 49bdc7f..ae6cfc4 100644 --- a/beeper/etc/containers/systemd/searxng/searxng.container +++ b/beeper/etc/containers/systemd/searxng/searxng.container @@ -8,7 +8,7 @@ Image=docker.io/searxng/searxng:latest ContainerName=searxng PublishPort=127.0.0.1:48898:8080 Network=searxng.network -Volume=/var/containers/searxng/searxng:/etc/searxng:Z +Volume=/var/containers/searxng/config:/etc/searxng:ro,Z Volume=searxng.volume:/var/cache/searxng [Service] diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container b/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container index 382fa48..1103462 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container @@ -11,7 +11,7 @@ Environment=DFLY_df_snapshot_format=false Environment=DFLY_dir=/data Image=docker.dragonflydb.io/dragonflydb/dragonfly Network=sharkey.network -Volume=/var/containers/sharkey/dfdb:/data:z +Volume=/var/containers/sharkey/dfdb:/data:Z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/spindle/spindle.container b/beeper/etc/containers/systemd/spindle/spindle.container index 5a92bce..28fb601 100644 --- a/beeper/etc/containers/systemd/spindle/spindle.container +++ b/beeper/etc/containers/systemd/spindle/spindle.container @@ -6,8 +6,8 @@ Image=ghcr.io/zenfyrdev/spindle:latest ContainerName=spindle EnvironmentFile=/etc/containers/systemd/spindle/.env PublishPort=127.0.0.1:40653:6555 -Volume=/var/containers/spindle/server/logs:/var/log/spindle:Z -Volume=/var/containers/spindle/server:/app:Z +Volume=/var/containers/spindle/logs:/var/log/spindle:Z +Volume=/var/containers/spindle/data:/app:Z Volume=/var/run/dind/docker.sock:/var/run/docker.sock:z [Service] diff --git a/beeper/etc/containers/systemd/xpost/xpost-zenfyr.container b/beeper/etc/containers/systemd/xpost/xpost-zenfyr.container index 2ac37c9..465ba79 100644 --- a/beeper/etc/containers/systemd/xpost/xpost-zenfyr.container +++ b/beeper/etc/containers/systemd/xpost/xpost-zenfyr.container @@ -3,7 +3,7 @@ Description=zenfyr's XPost [Container] Image=ghcr.io/zenfyrdev/xpost:latest -EnvironmentFile=/etc/containers/systemd/zenfyr-xpost/.env +EnvironmentFile=/etc/containers/systemd/xpost/zenfyr.env Volume=/var/containers/zenfyr-xpost/data:/app/data:Z,U [Service] diff --git a/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container b/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container index 6ec00ac..43255ce 100644 --- a/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container +++ b/beeper/etc/containers/systemd/yggdrasil/yggdrasil.container @@ -7,7 +7,7 @@ ContainerName=yggdrasil AutoUpdate=registry Exec=-useconffile /etc/yggdrasil/yggdrasil.conf -remote-tcp 22:22 -remote-tcp 80:80 -remote-udp 80:80 Network=host -Volume=/var/containers/yggdrasil:/etc/yggdrasil:ro,Z +Volume=/var/containers/yggdrasil/config:/etc/yggdrasil:ro,Z [Service] Restart=always