From 6cf7e7f1d7b9eb172c350fbf23e1973a53e569ef Mon Sep 17 00:00:00 2001 From: zenfyr Date: Fri, 2 Jan 2026 04:38:40 +0700 Subject: [PATCH] move .env to /etc/containers/systemd --- beeper/etc/containers/systemd/aode/aode-relay.container | 4 ++-- beeper/etc/containers/systemd/ejabberd/ejabberd.container | 2 +- .../etc/containers/systemd/forgejo/forgejo-runner.container | 2 +- beeper/etc/containers/systemd/forgejo/forgejo.container | 2 +- beeper/etc/containers/systemd/freshrss/freshrss.container | 2 +- beeper/etc/containers/systemd/knot/knot.container | 2 +- beeper/etc/containers/systemd/mailserver/mailserver.container | 2 +- .../containers/systemd/mastodon/mastodon-ingress.container | 4 ++-- .../containers/systemd/mastodon/mastodon-sidekiq.container | 4 ++-- .../containers/systemd/mastodon/mastodon-streaming.container | 4 ++-- beeper/etc/containers/systemd/mastodon/mastodon-web.container | 4 ++-- .../etc/containers/systemd/mollysocket/mollysocket.container | 4 ++-- beeper/etc/containers/systemd/pds/pds.container | 4 ++-- beeper/etc/containers/systemd/postgresql/postgresql.container | 2 +- beeper/etc/containers/systemd/redlib/redlib.container | 2 +- .../etc/containers/systemd/sharkey/sharkey-activity.container | 2 +- beeper/etc/containers/systemd/sharkey/sharkey-api.container | 2 +- beeper/etc/containers/systemd/sharkey/sharkey-media.container | 2 +- .../etc/containers/systemd/sharkey/sharkey-worker.container | 2 +- beeper/etc/containers/systemd/spindle/spindle.container | 2 +- .../etc/containers/systemd/vaultwarden/vaultwarden.container | 2 +- beeper/etc/containers/systemd/xpost/xpost-zenfyr.container | 2 +- beeper/etc/containers/systemd/zitadel/zitadel.container | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/beeper/etc/containers/systemd/aode/aode-relay.container b/beeper/etc/containers/systemd/aode/aode-relay.container index b5ff31f..7ef2dbe 100644 --- a/beeper/etc/containers/systemd/aode/aode-relay.container +++ b/beeper/etc/containers/systemd/aode/aode-relay.container @@ -4,8 +4,8 @@ Description=Aode ActivityPub Relay [Container] Image=registry.hub.docker.com/asonix/relay:latest ContainerName=aode-relay -EnvironmentFile=/var/containers/aode/.env.secrets -EnvironmentFile=/var/containers/aode/.env +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 diff --git a/beeper/etc/containers/systemd/ejabberd/ejabberd.container b/beeper/etc/containers/systemd/ejabberd/ejabberd.container index f0a4b87..4a4553e 100644 --- a/beeper/etc/containers/systemd/ejabberd/ejabberd.container +++ b/beeper/etc/containers/systemd/ejabberd/ejabberd.container @@ -7,7 +7,7 @@ After=postgresql.service Image=ghcr.io/processone/ejabberd:latest ContainerName=ejabberd Environment=CTL_ON_START=registered_users synth.download ; status -EnvironmentFile=/var/containers/ejabberd/.env +EnvironmentFile=/etc/containers/systemd/ejabberd/.env Network=ejabberd.network Network=postgresql.network PublishPort=5222:5222 diff --git a/beeper/etc/containers/systemd/forgejo/forgejo-runner.container b/beeper/etc/containers/systemd/forgejo/forgejo-runner.container index 8136a71..9b3ea37 100644 --- a/beeper/etc/containers/systemd/forgejo/forgejo-runner.container +++ b/beeper/etc/containers/systemd/forgejo/forgejo-runner.container @@ -6,7 +6,7 @@ Requires=dind.service [Container] Image=data.forgejo.org/forgejo/runner:4.0.0 ContainerName=forgejo-runner -EnvironmentFile=/var/containers/forgejo/.env.runner +EnvironmentFile=/etc/containers/systemd/forgejo/.env.runner Network=forgejo.network User=1001:1001 Exec=/bin/sh -c "sleep 5; forgejo-runner daemon" diff --git a/beeper/etc/containers/systemd/forgejo/forgejo.container b/beeper/etc/containers/systemd/forgejo/forgejo.container index eb0cd1e..dd4c760 100644 --- a/beeper/etc/containers/systemd/forgejo/forgejo.container +++ b/beeper/etc/containers/systemd/forgejo/forgejo.container @@ -6,7 +6,7 @@ Requires=postgresql.service [Container] Image=codeberg.org/forgejo/forgejo:13 ContainerName=forgejo -EnvironmentFile=/var/containers/forgejo/.env +EnvironmentFile=/etc/containers/systemd/forgejo/.env Network=forgejo.network Network=postgresql.network PublishPort=127.0.0.1:41807:3000 diff --git a/beeper/etc/containers/systemd/freshrss/freshrss.container b/beeper/etc/containers/systemd/freshrss/freshrss.container index fd9505a..c07efdf 100644 --- a/beeper/etc/containers/systemd/freshrss/freshrss.container +++ b/beeper/etc/containers/systemd/freshrss/freshrss.container @@ -6,7 +6,7 @@ After=postgresql.service [Container] Image=docker.io/freshrss/freshrss:latest ContainerName=freshrss -EnvironmentFile=/var/containers/freshrss/.env.secrets +EnvironmentFile=/etc/containers/systemd/freshrss/.env.secrets Network=freshrss.network Network=postgresql.network PublishPort=127.0.0.1:27819:80 diff --git a/beeper/etc/containers/systemd/knot/knot.container b/beeper/etc/containers/systemd/knot/knot.container index b2bdca3..b9a62a4 100644 --- a/beeper/etc/containers/systemd/knot/knot.container +++ b/beeper/etc/containers/systemd/knot/knot.container @@ -4,7 +4,7 @@ Description=Tangled Knot Server [Container] Image=ghcr.io/zenfyrdev/knot:latest ContainerName=knot -EnvironmentFile=/var/containers/knot/.env +EnvironmentFile=/etc/containers/systemd/knot/.env PublishPort=127.0.0.1:44131:5555 PublishPort=20564:22 Volume=/var/containers/knot/keys:/etc/ssh/keys:Z diff --git a/beeper/etc/containers/systemd/mailserver/mailserver.container b/beeper/etc/containers/systemd/mailserver/mailserver.container index 4d308bd..026ffa6 100644 --- a/beeper/etc/containers/systemd/mailserver/mailserver.container +++ b/beeper/etc/containers/systemd/mailserver/mailserver.container @@ -4,7 +4,7 @@ Description=mailserver [Container] Image=ghcr.io/docker-mailserver/docker-mailserver:edge ContainerName=mailserver -EnvironmentFile=/var/containers/mailserver/mailserver.env +EnvironmentFile=/etc/containers/systemd/mailserver/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-ingress.container b/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container index ff84931..d0b81e5 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container @@ -6,8 +6,8 @@ After=postgresql.service mastodon-dfdb.service [Container] Image=ghcr.io/synth-download/mastodon-ingress:nightly ContainerName=mastodon-ingress -EnvironmentFile=/var/containers/mastodon/.env.secrets -EnvironmentFile=/var/containers/mastodon/.env +EnvironmentFile=/etc/containers/systemd/mastodon/.env.secrets +EnvironmentFile=/etc/containers/systemd/mastodon/.env Network=mastodon.network Network=postgresql.network diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container b/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container index cf3efb2..09fcb4f 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container @@ -6,8 +6,8 @@ After=postgresql.service mastodon-dfdb.service [Container] Image=ghcr.io/synth-download/mastodon:nightly ContainerName=mastodon-sidekiq -EnvironmentFile=/var/containers/mastodon/.env.secrets -EnvironmentFile=/var/containers/mastodon/.env +EnvironmentFile=/etc/containers/systemd/mastodon/.env.secrets +EnvironmentFile=/etc/containers/systemd/mastodon/.env Exec=bundle exec sidekiq HealthCmd=ps aux | grep '[s]idekiq 7' || false Network=mastodon.network diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container b/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container index a7be589..50a9b95 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container @@ -6,8 +6,8 @@ After=postgresql.service mastodon-dfdb.service [Container] Image=ghcr.io/synth-download/mastodon-streaming:nightly ContainerName=mastodon-streaming -EnvironmentFile=/var/containers/mastodon/.env.secrets -EnvironmentFile=/var/containers/mastodon/.env +EnvironmentFile=/etc/containers/systemd/mastodon/.env.secrets +EnvironmentFile=/etc/containers/systemd/mastodon/.env Exec=node ./streaming/index.js HealthCmd=curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1 Network=mastodon.network diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-web.container b/beeper/etc/containers/systemd/mastodon/mastodon-web.container index 7a48881..a77598b 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-web.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-web.container @@ -6,8 +6,8 @@ After=postgresql.service mastodon-dfdb.service [Container] Image=ghcr.io/synth-download/mastodon:nightly ContainerName=mastodon-web -EnvironmentFile=/var/containers/mastodon/.env.secrets -EnvironmentFile=/var/containers/mastodon/.env +EnvironmentFile=/etc/containers/systemd/mastodon/.env.secrets +EnvironmentFile=/etc/containers/systemd/mastodon/.env Exec=bundle exec puma -C config/puma.rb HealthCmd=curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1 Network=mastodon.network diff --git a/beeper/etc/containers/systemd/mollysocket/mollysocket.container b/beeper/etc/containers/systemd/mollysocket/mollysocket.container index 176bcc1..b25260d 100644 --- a/beeper/etc/containers/systemd/mollysocket/mollysocket.container +++ b/beeper/etc/containers/systemd/mollysocket/mollysocket.container @@ -4,8 +4,8 @@ Description=MollySocket [Container] Image=ghcr.io/mollyim/mollysocket:1.6-alpine ContainerName=mollysocket -EnvironmentFile=/var/containers/mollysocket/.env.secrets -EnvironmentFile=/var/containers/mollysocket/.env +EnvironmentFile=/etc/containers/systemd/mollysocket/.env.secrets +EnvironmentFile=/etc/containers/systemd/mollysocket/.env Exec=server PublishPort=127.0.0.1:19236:19236 Volume=/var/containers/mollysocket/data:/data:Z diff --git a/beeper/etc/containers/systemd/pds/pds.container b/beeper/etc/containers/systemd/pds/pds.container index 3bc7016..166720a 100644 --- a/beeper/etc/containers/systemd/pds/pds.container +++ b/beeper/etc/containers/systemd/pds/pds.container @@ -4,8 +4,8 @@ Description=ATProto Personal Data Server [Container] Image=ghcr.io/bluesky-social/pds:latest ContainerName=pds -EnvironmentFile=/var/containers/pds/.env.secrets -EnvironmentFile=/var/containers/pds/.env +EnvironmentFile=/etc/containers/systemd/pds/.env.secrets +EnvironmentFile=/etc/containers/systemd/pds/.env PublishPort=127.0.0.1:24318:3000 Volume=pds.volume:/pds diff --git a/beeper/etc/containers/systemd/postgresql/postgresql.container b/beeper/etc/containers/systemd/postgresql/postgresql.container index 066c8f7..31c2aa4 100644 --- a/beeper/etc/containers/systemd/postgresql/postgresql.container +++ b/beeper/etc/containers/systemd/postgresql/postgresql.container @@ -4,7 +4,7 @@ Description=PostgreSQL Database [Container] Image=registry.hub.docker.com/groonga/pgroonga:latest-alpine-18 ContainerName=postgresql -EnvironmentFile=/var/containers/postgresql/.env +EnvironmentFile=/etc/containers/systemd/postgresql/.env Network=postgresql.network HealthCmd=pg_isready -U postgres -d postgres HealthInterval=40s diff --git a/beeper/etc/containers/systemd/redlib/redlib.container b/beeper/etc/containers/systemd/redlib/redlib.container index 76394bf..d9c3516 100644 --- a/beeper/etc/containers/systemd/redlib/redlib.container +++ b/beeper/etc/containers/systemd/redlib/redlib.container @@ -4,7 +4,7 @@ Description=Redlib [Container] Image=quay.io/redlib/redlib:latest ContainerName=redlib -EnvironmentFile=/var/containers/redlib/.env +EnvironmentFile=/etc/containers/systemd/redlib/.env HealthCmd=wget --spider -q --tries=1 http://localhost:8080/settings HealthInterval=5m HealthTimeout=3s diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container index 6f577a8..54e8fe9 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container @@ -11,7 +11,7 @@ Environment=MISSKEY_CONFIG_DIR=/sharkey/.config Environment=MK_ONLY_SERVER=1 Environment=MK_DISABLE_CLUSTERING=1 Environment=MK_NO_DAEMONS=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets +EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets Network=sharkey.network Network=postgresql.network PublishPort=127.0.0.1:47815:3002 diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-api.container b/beeper/etc/containers/systemd/sharkey/sharkey-api.container index 7d7ccea..ec3c4bd 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-api.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-api.container @@ -10,7 +10,7 @@ Environment=MISSKEY_CONFIG_YML=*.yml Environment=MISSKEY_CONFIG_DIR=/sharkey/.config Environment=MK_ONLY_SERVER=1 Environment=MK_DISABLE_CLUSTERING=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets +EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets Network=sharkey.network Network=postgresql.network PublishPort=127.0.0.1:60628:3001 diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-media.container b/beeper/etc/containers/systemd/sharkey/sharkey-media.container index deb49f5..fac7232 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-media.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-media.container @@ -11,7 +11,7 @@ Environment=MISSKEY_CONFIG_DIR=/sharkey/.config Environment=MK_ONLY_SERVER=1 Environment=MK_DISABLE_CLUSTERING=1 Environment=MK_NO_DAEMONS=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets +EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets Network=sharkey.network Network=postgresql.network PublishPort=127.0.0.1:57378:3003 diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey/sharkey-worker.container index 74427f0..f9e90e6 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-worker.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-worker.container @@ -9,7 +9,7 @@ Image=registry.activitypub.software/transfem-org/sharkey:develop Environment=MISSKEY_CONFIG_YML=*.yml Environment=MISSKEY_CONFIG_DIR=/sharkey/.config Environment=MK_ONLY_QUEUE=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets +EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets Network=sharkey.network Network=postgresql.network Volume=/var/containers/sharkey/files:/sharkey/files:z diff --git a/beeper/etc/containers/systemd/spindle/spindle.container b/beeper/etc/containers/systemd/spindle/spindle.container index 6e8376a..5a92bce 100644 --- a/beeper/etc/containers/systemd/spindle/spindle.container +++ b/beeper/etc/containers/systemd/spindle/spindle.container @@ -4,7 +4,7 @@ Description=Tangled Spindle Server [Container] Image=ghcr.io/zenfyrdev/spindle:latest ContainerName=spindle -EnvironmentFile=/var/containers/spindle/.env +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 diff --git a/beeper/etc/containers/systemd/vaultwarden/vaultwarden.container b/beeper/etc/containers/systemd/vaultwarden/vaultwarden.container index 9effe0a..3e79931 100644 --- a/beeper/etc/containers/systemd/vaultwarden/vaultwarden.container +++ b/beeper/etc/containers/systemd/vaultwarden/vaultwarden.container @@ -4,7 +4,7 @@ Description=Vaultwarden [Container] Image=vaultwarden/server:latest ContainerName=vaultwarden -EnvironmentFile=/var/containers/vaultwarden/.env +EnvironmentFile=/etc/containers/systemd/vaultwarden/.env PublishPort=127.0.0.1:60838:80 Volume=/var/containers/vaultwarden/data:/data:Z diff --git a/beeper/etc/containers/systemd/xpost/xpost-zenfyr.container b/beeper/etc/containers/systemd/xpost/xpost-zenfyr.container index 3e94994..2ac37c9 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=/var/containers/zenfyr-xpost/.env +EnvironmentFile=/etc/containers/systemd/zenfyr-xpost/.env Volume=/var/containers/zenfyr-xpost/data:/app/data:Z,U [Service] diff --git a/beeper/etc/containers/systemd/zitadel/zitadel.container b/beeper/etc/containers/systemd/zitadel/zitadel.container index 1d5a657..a3c8073 100644 --- a/beeper/etc/containers/systemd/zitadel/zitadel.container +++ b/beeper/etc/containers/systemd/zitadel/zitadel.container @@ -6,7 +6,7 @@ After=postgresql.service [Container] Image=ghcr.io/zitadel/zitadel:latest ContainerName=zitadel -EnvironmentFile=/var/containers/zitadel/.env +EnvironmentFile=/etc/containers/systemd/zitadel/.env Network=zitadel.network Network=postgresql.network PublishPort=127.0.0.1:19241:8080