From 590773f1fa9683133aefc851357bee9ff3c256a7 Mon Sep 17 00:00:00 2001 From: Ruben Date: Tue, 30 Dec 2025 01:21:15 -0600 Subject: [PATCH] update local ips, add wantedby for caddy --- beeper/etc/caddy/Caddyfile | 51 +++++++++++++++++++ .../containers/systemd/caddy/caddy.container | 5 +- .../sharkey/sharkey-activity.container | 2 +- .../systemd/sharkey/sharkey-api.container | 2 +- .../systemd/sharkey/sharkey-dfdb.container | 7 ++- .../systemd/sharkey/sharkey-media.container | 4 +- 6 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 beeper/etc/caddy/Caddyfile diff --git a/beeper/etc/caddy/Caddyfile b/beeper/etc/caddy/Caddyfile new file mode 100644 index 0000000..58dc1c3 --- /dev/null +++ b/beeper/etc/caddy/Caddyfile @@ -0,0 +1,51 @@ +# ============================================================================= + +# ╭────────────────────────────────╮ +# │ commonly reused rules/snippets │ +# ╰────────────────────────────────╯ + +# common settings - globally enables settings that are commonly used in every snippet +(common-settings) { + encode zstd gzip +} + +# log - reused log settings +(log) { + log { + output file /var/log/caddy/{args[0]} { + roll_size 10MB + roll_keep 1 + roll_keep_for 120h + } + } +} + +# robots-txt - link /robots.txt to the same file +(robots-txt) { + handle_path /robots.txt { + root * /var/www/robots.txt + file_server + } +} + +# ============================================================================= + +# ╭──────────────────────────╮ +# │ main/general information │ +# ╰──────────────────────────╯ + +{ + email synth@synth.download + import log caddy + acme_dns porkbun { + api_key {env.PORKBUN_API_KEY} + api_secret_key {env.PORKBUN_API_SECRET_KEY} + } +} + +# ╭───────────────────────────────────────────────────────────────────────────╮ +# │ do an nginx and seperate snippets for sites into /etc/caddy/sites-enabled │ +# ╰───────────────────────────────────────────────────────────────────────────╯ +# to "disable" anything, just move the file to /etc/caddy/sites-disabled and reload caddy + +import /etc/caddy/sites-enabled/* \ No newline at end of file diff --git a/beeper/etc/containers/systemd/caddy/caddy.container b/beeper/etc/containers/systemd/caddy/caddy.container index b7ff66d..4e211ba 100644 --- a/beeper/etc/containers/systemd/caddy/caddy.container +++ b/beeper/etc/containers/systemd/caddy/caddy.container @@ -15,4 +15,7 @@ Volume=/var/log/caddy:/var/log/caddy:z Volume=/var/www:/var/www:z [Service] -Restart=always \ No newline at end of file +Restart=always + +[Install] +WantedBy=default.target \ No newline at end of file diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container index e23b9a5..bbcca7c 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-activity.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-activity.container @@ -14,7 +14,7 @@ Environment=MK_NO_DAEMONS=1 EnvironmentFile=/var/containers/sharkey/.env.secrets Network=postgresql.network Network=sharkey.network -PublishPort=192.168.1.73:47815:3002 +PublishPort=127.0.0.1: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 diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-api.container b/beeper/etc/containers/systemd/sharkey/sharkey-api.container index 53480ee..ebec8e9 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-api.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-api.container @@ -13,7 +13,7 @@ Environment=MK_DISABLE_CLUSTERING=1 EnvironmentFile=/var/containers/sharkey/.env.secrets Network=postgresql.network Network=sharkey.network -PublishPort=192.168.1.73:60628:3001 +PublishPort=127.0.0.1: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 diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container b/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container index 717fafe..6138e2d 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-dfdb.container @@ -2,7 +2,12 @@ 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 +Environment="DFLY_snapshot_cron=* * * * *" +Environment=DFLY_version_check=false +Environment=DFLY_default_lua_flags=allow-undeclared-keys +Environment=DFLY_dbfilename=dump.rdb +Environment=DFLY_df_snapshot_format=false +Environment=DFLY_dir=/data Image=docker.dragonflydb.io/dragonflydb/dragonfly Network=sharkey.network Volume=/var/containers/sharkey/dfdb:/data:z diff --git a/beeper/etc/containers/systemd/sharkey/sharkey-media.container b/beeper/etc/containers/systemd/sharkey/sharkey-media.container index b8c83e1..94b254c 100644 --- a/beeper/etc/containers/systemd/sharkey/sharkey-media.container +++ b/beeper/etc/containers/systemd/sharkey/sharkey-media.container @@ -14,7 +14,7 @@ Environment=MK_NO_DAEMONS=1 EnvironmentFile=/var/containers/sharkey/.env.secrets Network=postgresql.network Network=sharkey.network -PublishPort=192.168.1.73:57378:3003 +PublishPort=127.0.0.1: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 @@ -24,4 +24,4 @@ Restart=always RestartSec=10s [Install] -WantedBy=default.target +WantedBy=default.target \ No newline at end of file