From 6ede4585461f8d21727714d91f13894edb0b777e Mon Sep 17 00:00:00 2001 From: Ruben Date: Tue, 30 Dec 2025 00:44:37 -0600 Subject: [PATCH] fix sharkey containers, add caddy --- beeper/etc/containers/.gitkeep | 0 beeper/etc/containers/networks/.gitkeep | 0 beeper/etc/containers/systemd/caddy/.gitkeep | 0 .../containers/systemd/caddy/caddy.container | 18 ++++++++++++++++++ .../etc/containers/systemd/mastodon/.gitkeep | 0 .../etc/containers/systemd/postgresql/.gitkeep | 0 .../systemd/sharkey/sharkey-activity.container | 2 +- .../systemd/sharkey/sharkey-api.container | 2 +- .../systemd/sharkey/sharkey-media.container | 2 +- .../systemd/sharkey/sharkey-worker.container | 2 +- 10 files changed, 22 insertions(+), 4 deletions(-) delete mode 100644 beeper/etc/containers/.gitkeep delete mode 100644 beeper/etc/containers/networks/.gitkeep delete mode 100644 beeper/etc/containers/systemd/caddy/.gitkeep create mode 100644 beeper/etc/containers/systemd/caddy/caddy.container delete mode 100644 beeper/etc/containers/systemd/mastodon/.gitkeep delete mode 100644 beeper/etc/containers/systemd/postgresql/.gitkeep diff --git a/beeper/etc/containers/.gitkeep b/beeper/etc/containers/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/beeper/etc/containers/networks/.gitkeep b/beeper/etc/containers/networks/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/beeper/etc/containers/systemd/caddy/.gitkeep b/beeper/etc/containers/systemd/caddy/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/beeper/etc/containers/systemd/caddy/caddy.container b/beeper/etc/containers/systemd/caddy/caddy.container new file mode 100644 index 0000000..b7ff66d --- /dev/null +++ b/beeper/etc/containers/systemd/caddy/caddy.container @@ -0,0 +1,18 @@ +[Unit] +Description=Caddy reverse proxy +After=network-online.target +Wants=network-online.target + +[Container] +AddCapability=NET_ADMIN +ContainerName=caddy +Image=ghcr.io/zenfyrdev/caddy:latest +Network=host +Volume=/etc/caddy:/etc/caddy:z +Volume=/var/containers/caddy/caddy_config:/config:z +Volume=/var/containers/caddy/caddy_data:/data:z +Volume=/var/log/caddy:/var/log/caddy:z +Volume=/var/www:/var/www:z + +[Service] +Restart=always \ No newline at end of file diff --git a/beeper/etc/containers/systemd/mastodon/.gitkeep b/beeper/etc/containers/systemd/mastodon/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/beeper/etc/containers/systemd/postgresql/.gitkeep b/beeper/etc/containers/systemd/postgresql/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container index d2857f4..e23b9a5 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container @@ -17,7 +17,7 @@ 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 -Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro,z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-api.container b/beeper/etc/containers/systemd/sharkey/sharkey-api.container index a2508bf..53480ee 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-api.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-api.container @@ -16,7 +16,7 @@ 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 -Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro,z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-media.container b/beeper/etc/containers/systemd/sharkey/sharkey-media.container index 67e74af..b8c83e1 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-media.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-media.container @@ -17,7 +17,7 @@ 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 -Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro:z +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro,z [Service] Restart=always diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-worker.container b/beeper/etc/containers/systemd/sharkey/sharkey-worker.container index 537a489..ac10180 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-worker.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-worker.container @@ -14,7 +14,7 @@ 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 +Volume=/var/containers/sharkey/default.yml:/sharkey/.config/default.yml:ro,z [Service] Restart=always