Merge branch 'main' of ssh://synth.download:10429/sd/synth.download

This commit is contained in:
Ruben 2026-01-09 21:17:45 -06:00
commit a736c43540
Signed by: sneexy
GPG key ID: 8ECFA045E63BC583
64 changed files with 522 additions and 51 deletions

View file

@ -1,8 +1,7 @@
[Unit]
Description=Sharkey's ActivityPub Federation service
After=postgresql.service sharkey-dfdb.service network-online.target
After=postgresql.service sharkey-dfdb.service
Requires=postgresql.service sharkey-dfdb.service
Wants=network-online.target
[Container]
ContainerName=sharkey-activity
@ -12,9 +11,9 @@ 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
EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets
Network=sharkey.network
Network=postgresql.network
PublishPort=127.0.0.1:47815:3002
Volume=/var/containers/sharkey/files:/sharkey/files:z
Volume=/var/containers/sharkey/activity:/sharkey/.config:z

View file

@ -1,8 +1,7 @@
[Unit]
Description=Sharkey's API and Web service
After=postgresql.service sharkey-dfdb.service network-online.target
After=postgresql.service sharkey-dfdb.service
Requires=postgresql.service sharkey-dfdb.service
Wants=network-online.target
[Container]
ContainerName=sharkey-api
@ -11,9 +10,9 @@ 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
EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets
Network=sharkey.network
Network=postgresql.network
PublishPort=127.0.0.1:60628:3001
Volume=/var/containers/sharkey/files:/sharkey/files:z
Volume=/var/containers/sharkey/api:/sharkey/.config:z

View file

@ -14,7 +14,7 @@ HealthCmd=redis-cli ping
HealthInterval=5s
HealthRetries=20
Network=sharkey.network
Volume=/var/containers/sharkey/dfdb:/data:z
Volume=/var/containers/sharkey/dfdb:/data:Z
[Service]
Restart=always

View file

@ -1,8 +1,7 @@
[Unit]
Description=Sharkey's Media service
After=postgresql.service sharkey-dfdb.service network-online.target
After=postgresql.service sharkey-dfdb.service
Requires=postgresql.service sharkey-dfdb.service
Wants=network-online.target
[Container]
ContainerName=sharkey-media
@ -12,9 +11,9 @@ 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
EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets
Network=sharkey.network
Network=postgresql.network
PublishPort=127.0.0.1:57378:3003
Volume=/var/containers/sharkey/files:/sharkey/files:z
Volume=/var/containers/sharkey/media:/sharkey/.config:z
@ -25,4 +24,4 @@ Restart=always
RestartSec=10s
[Install]
WantedBy=default.target
WantedBy=default.target

View file

@ -1,8 +1,7 @@
[Unit]
Description=Sharkey's Worker service
After=postgresql.service sharkey-dfdb.service network-online.target
After=postgresql.service sharkey-dfdb.service
Requires=postgresql.service sharkey-dfdb.service
Wants=network-online.target
[Container]
ContainerName=sharkey-worker
@ -10,9 +9,9 @@ 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
EnvironmentFile=/etc/containers/systemd/sharkey/.env.secrets
Network=sharkey.network
Network=postgresql.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

View file

@ -1,3 +1,2 @@
[Network]
NetworkName=sharkey
IPv6=true