From f941550bfb34b421a11ff6720be6a538312414c4 Mon Sep 17 00:00:00 2001 From: desktop Date: Mon, 29 Dec 2025 18:38:01 +0700 Subject: [PATCH 1/5] use :z instead of :Z, since we don't use pods yet --- beeper/etc/containers/systemd/sharkey-activity.container | 8 ++++---- beeper/etc/containers/systemd/sharkey-api.container | 8 ++++---- beeper/etc/containers/systemd/sharkey-media.container | 8 ++++---- beeper/etc/containers/systemd/sharkey-worker.container | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/beeper/etc/containers/systemd/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey-activity.container index cefd9b8..d9676d4 100644 --- a/beeper/etc/containers/systemd/sharkey-activity.container +++ b/beeper/etc/containers/systemd/sharkey-activity.container @@ -8,9 +8,9 @@ Image=registry.activitypub.software/transfem-org/sharkey:develop Network=postgresql Network=sharkey PublishPort=192.168.1.73:47815:3002 -Volume=/var/containers/sharkey/files:/sharkey/files:Z -Volume=/var/containers/sharkey/activity:/sharkey/.config:Z -Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z +Volume=/var/containers/sharkey/files:/sharkey/files:z +Volume=/var/containers/sharkey/activity:/sharkey/.config:z +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] -Restart=always \ No newline at end of file +Restart=always diff --git a/beeper/etc/containers/systemd/sharkey-api.container b/beeper/etc/containers/systemd/sharkey-api.container index 7e584ef..ad83d51 100644 --- a/beeper/etc/containers/systemd/sharkey-api.container +++ b/beeper/etc/containers/systemd/sharkey-api.container @@ -8,9 +8,9 @@ Image=registry.activitypub.software/transfem-org/sharkey:develop Network=postgresql Network=sharkey PublishPort=192.168.1.73:60628:3001 -Volume=/var/containers/sharkey/files:/sharkey/files:Z -Volume=/var/containers/sharkey/api:/sharkey/.config:Z -Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z +Volume=/var/containers/sharkey/files:/sharkey/files:z +Volume=/var/containers/sharkey/api:/sharkey/.config:z +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] -Restart=always \ No newline at end of file +Restart=always diff --git a/beeper/etc/containers/systemd/sharkey-media.container b/beeper/etc/containers/systemd/sharkey-media.container index 3e182f5..880b12e 100644 --- a/beeper/etc/containers/systemd/sharkey-media.container +++ b/beeper/etc/containers/systemd/sharkey-media.container @@ -8,9 +8,9 @@ Image=registry.activitypub.software/transfem-org/sharkey:develop Network=postgresql Network=sharkey PublishPort=192.168.1.73:57378:3003 -Volume=/var/containers/sharkey/files:/sharkey/files:Z -Volume=/var/containers/sharkey/media:/sharkey/.config:Z -Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z +Volume=/var/containers/sharkey/files:/sharkey/files:z +Volume=/var/containers/sharkey/media:/sharkey/.config:z +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] -Restart=always \ No newline at end of file +Restart=always diff --git a/beeper/etc/containers/systemd/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey-worker.container index 0426a66..08442ab 100644 --- a/beeper/etc/containers/systemd/sharkey-worker.container +++ b/beeper/etc/containers/systemd/sharkey-worker.container @@ -7,9 +7,9 @@ EnvironmentFile=/var/containers/sharkey/.env.secrets Image=registry.activitypub.software/transfem-org/sharkey:develop Network=postgresql Network=sharkey -Volume=/var/containers/sharkey/files:/sharkey/files:Z -Volume=/var/containers/sharkey/worker:/sharkey/.config:Z -Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:Z +Volume=/var/containers/sharkey/files:/sharkey/files:z +Volume=/var/containers/sharkey/worker:/sharkey/.config:z +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] -Restart=always \ No newline at end of file +Restart=always From 1b758b5398e74a0e9b3219579488278825c46781 Mon Sep 17 00:00:00 2001 From: desktop Date: Mon, 29 Dec 2025 18:41:05 +0700 Subject: [PATCH 2/5] split Environment --- beeper/etc/containers/systemd/sharkey-activity.container | 8 ++++++-- beeper/etc/containers/systemd/sharkey-api.container | 7 +++++-- beeper/etc/containers/systemd/sharkey-media.container | 8 ++++++-- beeper/etc/containers/systemd/sharkey-worker.container | 6 ++++-- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/beeper/etc/containers/systemd/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey-activity.container index d9676d4..a63b605 100644 --- a/beeper/etc/containers/systemd/sharkey-activity.container +++ b/beeper/etc/containers/systemd/sharkey-activity.container @@ -2,9 +2,13 @@ Description=Sharkey's ActivityPub Federation service [Container] -Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_SERVER=1 MK_DISABLE_CLUSTERING=1 MK_NO_DAEMONS=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets Image=registry.activitypub.software/transfem-org/sharkey:develop +Environment=MISSKEY_CONFIG_YML=*.yml +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 Network=postgresql Network=sharkey PublishPort=192.168.1.73:47815:3002 diff --git a/beeper/etc/containers/systemd/sharkey-api.container b/beeper/etc/containers/systemd/sharkey-api.container index ad83d51..5c09134 100644 --- a/beeper/etc/containers/systemd/sharkey-api.container +++ b/beeper/etc/containers/systemd/sharkey-api.container @@ -2,9 +2,12 @@ Description=Sharkey's API and Web service [Container] -Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_SERVER=1 MK_DISABLE_CLUSTERING=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets Image=registry.activitypub.software/transfem-org/sharkey:develop +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 Network=postgresql Network=sharkey PublishPort=192.168.1.73:60628:3001 diff --git a/beeper/etc/containers/systemd/sharkey-media.container b/beeper/etc/containers/systemd/sharkey-media.container index 880b12e..fff3480 100644 --- a/beeper/etc/containers/systemd/sharkey-media.container +++ b/beeper/etc/containers/systemd/sharkey-media.container @@ -2,9 +2,13 @@ Description=Sharkey's Media service [Container] -Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_SERVER=1 MK_DISABLE_CLUSTERING=1 MK_NO_DAEMONS=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets Image=registry.activitypub.software/transfem-org/sharkey:develop +Environment=MISSKEY_CONFIG_YML=*.yml +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 Network=postgresql Network=sharkey PublishPort=192.168.1.73:57378:3003 diff --git a/beeper/etc/containers/systemd/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey-worker.container index 08442ab..3226ac9 100644 --- a/beeper/etc/containers/systemd/sharkey-worker.container +++ b/beeper/etc/containers/systemd/sharkey-worker.container @@ -2,9 +2,11 @@ Description=Sharkey's Worker service [Container] -Environment=MISSKEY_CONFIG_YML=*.yml MISSKEY_CONFIG_DIR=/sharkey/.config MK_ONLY_QUEUE=1 -EnvironmentFile=/var/containers/sharkey/.env.secrets 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 Network=postgresql Network=sharkey Volume=/var/containers/sharkey/files:/sharkey/files:z From 55589f08552f0d6c5a18ee0f0e7025fad39dd582 Mon Sep 17 00:00:00 2001 From: desktop Date: Mon, 29 Dec 2025 18:41:41 +0700 Subject: [PATCH 3/5] use correct quadlet network syntax --- beeper/etc/containers/systemd/sharkey-activity.container | 4 ++-- beeper/etc/containers/systemd/sharkey-api.container | 4 ++-- beeper/etc/containers/systemd/sharkey-media.container | 4 ++-- beeper/etc/containers/systemd/sharkey-worker.container | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/beeper/etc/containers/systemd/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey-activity.container index a63b605..33a6cd2 100644 --- a/beeper/etc/containers/systemd/sharkey-activity.container +++ b/beeper/etc/containers/systemd/sharkey-activity.container @@ -9,8 +9,8 @@ Environment=MK_ONLY_SERVER=1 Environment=MK_DISABLE_CLUSTERING=1 Environment=MK_NO_DAEMONS=1 EnvironmentFile=/var/containers/sharkey/.env.secrets -Network=postgresql -Network=sharkey +Network=postgresql.network +Network=sharkey.network PublishPort=192.168.1.73:47815:3002 Volume=/var/containers/sharkey/files:/sharkey/files:z Volume=/var/containers/sharkey/activity:/sharkey/.config:z diff --git a/beeper/etc/containers/systemd/sharkey-api.container b/beeper/etc/containers/systemd/sharkey-api.container index 5c09134..7a11b45 100644 --- a/beeper/etc/containers/systemd/sharkey-api.container +++ b/beeper/etc/containers/systemd/sharkey-api.container @@ -8,8 +8,8 @@ Environment=MISSKEY_CONFIG_DIR=/sharkey/.config Environment=MK_ONLY_SERVER=1 Environment=MK_DISABLE_CLUSTERING=1 EnvironmentFile=/var/containers/sharkey/.env.secrets -Network=postgresql -Network=sharkey +Network=postgresql.network +Network=sharkey.network PublishPort=192.168.1.73:60628:3001 Volume=/var/containers/sharkey/files:/sharkey/files:z Volume=/var/containers/sharkey/api:/sharkey/.config:z diff --git a/beeper/etc/containers/systemd/sharkey-media.container b/beeper/etc/containers/systemd/sharkey-media.container index fff3480..8df2de6 100644 --- a/beeper/etc/containers/systemd/sharkey-media.container +++ b/beeper/etc/containers/systemd/sharkey-media.container @@ -9,8 +9,8 @@ Environment=MK_ONLY_SERVER=1 Environment=MK_DISABLE_CLUSTERING=1 Environment=MK_NO_DAEMONS=1 EnvironmentFile=/var/containers/sharkey/.env.secrets -Network=postgresql -Network=sharkey +Network=postgresql.network +Network=sharkey.network PublishPort=192.168.1.73:57378:3003 Volume=/var/containers/sharkey/files:/sharkey/files:z Volume=/var/containers/sharkey/media:/sharkey/.config:z diff --git a/beeper/etc/containers/systemd/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey-worker.container index 3226ac9..2f7d989 100644 --- a/beeper/etc/containers/systemd/sharkey-worker.container +++ b/beeper/etc/containers/systemd/sharkey-worker.container @@ -7,8 +7,8 @@ Environment=MISSKEY_CONFIG_YML=*.yml Environment=MISSKEY_CONFIG_DIR=/sharkey/.config Environment=MK_ONLY_QUEUE=1 EnvironmentFile=/var/containers/sharkey/.env.secrets -Network=postgresql -Network=sharkey +Network=postgresql.network +Network=sharkey.network Volume=/var/containers/sharkey/files:/sharkey/files:z Volume=/var/containers/sharkey/worker:/sharkey/.config:z Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z From b65b61b082f4ed2214da4ff510c2b1a8d26cd471 Mon Sep 17 00:00:00 2001 From: desktop Date: Mon, 29 Dec 2025 18:44:59 +0700 Subject: [PATCH 4/5] make sharkey depend on dfdb service and delay restarts --- beeper/etc/containers/systemd/sharkey-activity.container | 6 ++++++ beeper/etc/containers/systemd/sharkey-api.container | 6 ++++++ beeper/etc/containers/systemd/sharkey-dfdb.container | 6 +++++- beeper/etc/containers/systemd/sharkey-media.container | 6 ++++++ beeper/etc/containers/systemd/sharkey-worker.container | 6 ++++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/beeper/etc/containers/systemd/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey-activity.container index 33a6cd2..f9858a4 100644 --- a/beeper/etc/containers/systemd/sharkey-activity.container +++ b/beeper/etc/containers/systemd/sharkey-activity.container @@ -1,5 +1,7 @@ [Unit] Description=Sharkey's ActivityPub Federation service +Requires=sharkey-dfdb.service +After=sharkey-dfdb.service [Container] Image=registry.activitypub.software/transfem-org/sharkey:develop @@ -18,3 +20,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] Restart=always +RestartSec=10s + +[Install] +WantedBy=default.target diff --git a/beeper/etc/containers/systemd/sharkey-api.container b/beeper/etc/containers/systemd/sharkey-api.container index 7a11b45..ad77dfc 100644 --- a/beeper/etc/containers/systemd/sharkey-api.container +++ b/beeper/etc/containers/systemd/sharkey-api.container @@ -1,5 +1,7 @@ [Unit] Description=Sharkey's API and Web service +Requires=sharkey-dfdb.service +After=sharkey-dfdb.service [Container] Image=registry.activitypub.software/transfem-org/sharkey:develop @@ -17,3 +19,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] Restart=always +RestartSec=10s + +[Install] +WantedBy=default.target diff --git a/beeper/etc/containers/systemd/sharkey-dfdb.container b/beeper/etc/containers/systemd/sharkey-dfdb.container index 26f9b11..93aa621 100644 --- a/beeper/etc/containers/systemd/sharkey-dfdb.container +++ b/beeper/etc/containers/systemd/sharkey-dfdb.container @@ -8,4 +8,8 @@ Network=sharkey Volume=/var/containers/sharkey/dfdb:/data:z [Service] -Restart=always \ No newline at end of file +Restart=always +RestartSec=10s + +[Install] +WantedBy=default.target diff --git a/beeper/etc/containers/systemd/sharkey-media.container b/beeper/etc/containers/systemd/sharkey-media.container index 8df2de6..3dfb6fb 100644 --- a/beeper/etc/containers/systemd/sharkey-media.container +++ b/beeper/etc/containers/systemd/sharkey-media.container @@ -1,5 +1,7 @@ [Unit] Description=Sharkey's Media service +Requires=sharkey-dfdb.service +After=sharkey-dfdb.service [Container] Image=registry.activitypub.software/transfem-org/sharkey:develop @@ -18,3 +20,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] Restart=always +RestartSec=10s + +[Install] +WantedBy=default.target diff --git a/beeper/etc/containers/systemd/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey-worker.container index 2f7d989..5a18e3a 100644 --- a/beeper/etc/containers/systemd/sharkey-worker.container +++ b/beeper/etc/containers/systemd/sharkey-worker.container @@ -1,5 +1,7 @@ [Unit] Description=Sharkey's Worker service +Requires=sharkey-dfdb.service +After=sharkey-dfdb.service [Container] Image=registry.activitypub.software/transfem-org/sharkey:develop @@ -15,3 +17,7 @@ Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z [Service] Restart=always +RestartSec=10s + +[Install] +WantedBy=default.target From e58b57044d8431ab290c8c4df8a76bf87f9e1e6f Mon Sep 17 00:00:00 2001 From: desktop Date: Mon, 29 Dec 2025 18:45:49 +0700 Subject: [PATCH 5/5] forgot .network on dfdb --- beeper/etc/containers/systemd/sharkey-dfdb.container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beeper/etc/containers/systemd/sharkey-dfdb.container b/beeper/etc/containers/systemd/sharkey-dfdb.container index 93aa621..717fafe 100644 --- a/beeper/etc/containers/systemd/sharkey-dfdb.container +++ b/beeper/etc/containers/systemd/sharkey-dfdb.container @@ -4,7 +4,7 @@ Description=Sharkey's DragonflyDB process [Container] Environment="DFLY_snapshot_cron=* * * * *" DFLY_version_check=false DFLY_default_lua_flags=allow-undeclared-keys DFLY_dbfilename=dump.rdb DFLY_df_snapshot_format=false DFLY_dir=/data Image=docker.dragonflydb.io/dragonflydb/dragonfly -Network=sharkey +Network=sharkey.network Volume=/var/containers/sharkey/dfdb:/data:z [Service]