From 9d71a7c7fa9b19d6a7e4c3e7a94e8b3b990748bc Mon Sep 17 00:00:00 2001 From: zenfyr Date: Wed, 31 Dec 2025 02:41:25 +0700 Subject: [PATCH] update ips for masto and add container names --- .../containers/systemd/mastodon/mastodon-darkhttpd.container | 3 ++- beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container | 1 + .../etc/containers/systemd/mastodon/mastodon-ingress.container | 1 + .../etc/containers/systemd/mastodon/mastodon-sidekiq.container | 1 + .../containers/systemd/mastodon/mastodon-streaming.container | 3 ++- beeper/etc/containers/systemd/mastodon/mastodon-web.container | 3 ++- beeper/etc/containers/systemd/mastodon/mastodon.network | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container b/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container index 9b5b2a6..8b81d34 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-darkhttpd.container @@ -5,8 +5,9 @@ Wants=network-online.target [Container] Image=p3terx/darkhttpd +ContainerName=mastodon-darkhttpd Exec=/mastodon/public/system -PublishPort=192.168.1.73:42261:80 +PublishPort=127.0.0.1:42261:80 Volume=/var/containers/mastodon/public/system:/mastodon/public/system:z [Service] diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container index ff66b7b..92e1c21 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-dfdb.container @@ -3,6 +3,7 @@ Description=Mastodon Dragonfly DB [Container] Image=docker.dragonflydb.io/dragonflydb/dragonfly +ContainerName=mastodon-dfdb Environment=DFLY_snapshot_cron=* * * * * Environment=DFLY_version_check=false Environment=DFLY_default_lua_flags=allow-undeclared-keys diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container b/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container index a7fe80e..ff84931 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-ingress.container @@ -5,6 +5,7 @@ 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 Network=mastodon.network diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container b/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container index 7c9e871..cf3efb2 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-sidekiq.container @@ -5,6 +5,7 @@ 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 Exec=bundle exec sidekiq diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container b/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container index 77630b8..a7be589 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-streaming.container @@ -5,13 +5,14 @@ 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 Exec=node ./streaming/index.js HealthCmd=curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1 Network=mastodon.network Network=postgresql.network -PublishPort=192.168.1.73:58834:4000 +PublishPort=127.0.0.1:58834:4000 [Service] Restart=always diff --git a/beeper/etc/containers/systemd/mastodon/mastodon-web.container b/beeper/etc/containers/systemd/mastodon/mastodon-web.container index 69c7381..7a48881 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon-web.container +++ b/beeper/etc/containers/systemd/mastodon/mastodon-web.container @@ -5,13 +5,14 @@ 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 Exec=bundle exec puma -C config/puma.rb HealthCmd=curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1 Network=mastodon.network Network=postgresql.network -PublishPort=192.168.1.73:46098:3000 +PublishPort=127.0.0.1:46098:3000 Volume=/var/containers/mastodon/public/system:/mastodon/public/system:z Volume=/var/containers/mastodon/init/disable_ssl.rb:/mastodon/config/initializers/disable_ssl.rb:ro,z Volume=/var/containers/mastodon/shared:/shared:z diff --git a/beeper/etc/containers/systemd/mastodon/mastodon.network b/beeper/etc/containers/systemd/mastodon/mastodon.network index 264f70a..f18f46d 100644 --- a/beeper/etc/containers/systemd/mastodon/mastodon.network +++ b/beeper/etc/containers/systemd/mastodon/mastodon.network @@ -1 +1,2 @@ [Network] +NetworkName=mastodon