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

beeper/etc/containers/systemd/caddy/caddy.container

@@ -4,8 +4,8 @@ After=network-online.target
 Wants=network-online.target
 
 [Container]
-AddCapability=NET_ADMIN
 ContainerName=caddy
+AddCapability=NET_ADMIN
 Image=ghcr.io/zenfyrdev/caddy:latest
 Network=host
 Volume=/etc/caddy:/etc/caddy:z

beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container

@@ -2,6 +2,7 @@
 Description=Mastodon Dragonfly DB
 
 [Container]
+ContainerName=mastodon-dfdb
 Image=docker.dragonflydb.io/dragonflydb/dragonfly
 ContainerName=mastodon-dfdb
 Environment=DFLY_snapshot_cron="* * * * *"

beeper/etc/containers/systemd/mastodon/mastodon-ingress.container

@@ -4,6 +4,7 @@ Requires=postgresql.service mastodon-dfdb.service
 After=postgresql.service mastodon-dfdb.service
 
 [Container]
+ContainerName=mastodon-ingress
 Image=ghcr.io/synth-download/mastodon-ingress:nightly
 ContainerName=mastodon-ingress
 EnvironmentFile=/var/containers/mastodon/.env.secrets

beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container

@@ -4,6 +4,7 @@ Requires=postgresql.service mastodon-dfdb.service
 After=postgresql.service mastodon-dfdb.service
 
 [Container]
+ContainerName=mastodon-sidekiq
 Image=ghcr.io/synth-download/mastodon:nightly
 ContainerName=mastodon-sidekiq
 EnvironmentFile=/var/containers/mastodon/.env.secrets

beeper/etc/containers/systemd/mastodon/mastodon-streaming.container

@@ -4,6 +4,7 @@ Requires=postgresql.service mastodon-dfdb.service
 After=postgresql.service mastodon-dfdb.service
 
 [Container]
+ContainerName=mastodon-streaming
 Image=ghcr.io/synth-download/mastodon-streaming:nightly
 ContainerName=mastodon-streaming
 EnvironmentFile=/var/containers/mastodon/.env.secrets

beeper/etc/containers/systemd/mastodon/mastodon-web.container

@@ -4,6 +4,7 @@ Requires=postgresql.service mastodon-dfdb.service
 After=postgresql.service mastodon-dfdb.service
 
 [Container]
+ContainerName=mastodon-web
 Image=ghcr.io/synth-download/mastodon:nightly
 ContainerName=mastodon-web
 EnvironmentFile=/var/containers/mastodon/.env.secrets

beeper/etc/containers/systemd/postgresql/postgresql.container

@@ -2,6 +2,7 @@
 Description=PostgreSQL Database
 
 [Container]
+ContainerName=postgresql
 Image=registry.hub.docker.com/groonga/pgroonga:latest-alpine-18
 ContainerName=postgresql
 EnvironmentFile=/var/containers/postgresql/.env

beeper/etc/containers/systemd/sharkey/sharkey-activity.container

@@ -5,6 +5,7 @@ Requires=postgresql.service sharkey-dfdb.service
 Wants=network-online.target
 
 [Container]
+ContainerName=sharkey-activity
 Image=registry.activitypub.software/transfem-org/sharkey:develop
 Environment=MISSKEY_CONFIG_YML=*.yml
 Environment=MISSKEY_CONFIG_DIR=/sharkey/.config

beeper/etc/containers/systemd/sharkey/sharkey-api.container

@@ -5,6 +5,7 @@ Requires=postgresql.service sharkey-dfdb.service
 Wants=network-online.target
 
 [Container]
+ContainerName=sharkey-api
 Image=registry.activitypub.software/transfem-org/sharkey:develop
 Environment=MISSKEY_CONFIG_YML=*.yml
 Environment=MISSKEY_CONFIG_DIR=/sharkey/.config

beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container

@@ -2,7 +2,8 @@
 Description=Sharkey's DragonflyDB process
 
 [Container]
-Environment="DFLY_snapshot_cron=* * * * *"
+ContainerName=sharkey-dfdb
+Environment=DFLY_snapshot_cron="* * * * *"
 Environment=DFLY_version_check=false
 Environment=DFLY_default_lua_flags=allow-undeclared-keys
 Environment=DFLY_dbfilename=dump.rdb

beeper/etc/containers/systemd/sharkey/sharkey-media.container

@@ -5,6 +5,7 @@ Requires=postgresql.service sharkey-dfdb.service
 Wants=network-online.target
 
 [Container]
+ContainerName=sharkey-media
 Image=registry.activitypub.software/transfem-org/sharkey:develop
 Environment=MISSKEY_CONFIG_YML=*.yml
 Environment=MISSKEY_CONFIG_DIR=/sharkey/.config

beeper/etc/containers/systemd/sharkey/sharkey-worker.container

@@ -5,6 +5,7 @@ Requires=postgresql.service sharkey-dfdb.service
 Wants=network-online.target
 
 [Container]
+ContainerName=sharkey-worker
 Image=registry.activitypub.software/transfem-org/sharkey:develop
 Environment=MISSKEY_CONFIG_YML=*.yml
 Environment=MISSKEY_CONFIG_DIR=/sharkey/.config

beeper/etc/systemd/system/cockpit.socket.d/override.conf

@@ -0,0 +1,6 @@
+# make cockpit only available on local IP
+
+[Socket]
+ListenStream=
+ListenStream=127.0.0.1:9090
+FreeBind=yes