From afdc95bbb14b141e209ca174ab25d409a2769f6a Mon Sep 17 00:00:00 2001
From: Ruben <sneexy@disroot.org>
Date: Mon, 18 Aug 2025 16:41:49 -0500
Subject: [PATCH] move caddy configurations to /etc/caddy

---
 phosphorus/{srv/docker/caddy/conf => etc/caddy}/Caddyfile      | 3 ++-
 .../caddy/conf => etc/caddy}/sites-enabled/fedi-frontends      | 0
 .../docker/caddy/conf => etc/caddy}/sites-enabled/iceshrimp    | 0
 .../docker/caddy/conf => etc/caddy}/sites-enabled/mastodon     | 0
 .../{srv/docker/caddy/conf => etc/caddy}/sites-enabled/pds     | 0
 .../{srv/docker/caddy/conf => etc/caddy}/sites-enabled/sharkey | 0
 phosphorus/srv/docker/caddy/compose.yaml                       | 2 +-
 7 files changed, 3 insertions(+), 2 deletions(-)
 rename phosphorus/{srv/docker/caddy/conf => etc/caddy}/Caddyfile (97%)
 rename phosphorus/{srv/docker/caddy/conf => etc/caddy}/sites-enabled/fedi-frontends (100%)
 rename phosphorus/{srv/docker/caddy/conf => etc/caddy}/sites-enabled/iceshrimp (100%)
 rename phosphorus/{srv/docker/caddy/conf => etc/caddy}/sites-enabled/mastodon (100%)
 rename phosphorus/{srv/docker/caddy/conf => etc/caddy}/sites-enabled/pds (100%)
 rename phosphorus/{srv/docker/caddy/conf => etc/caddy}/sites-enabled/sharkey (100%)

diff --git a/phosphorus/srv/docker/caddy/conf/Caddyfile b/phosphorus/etc/caddy/Caddyfile
similarity index 97%
rename from phosphorus/srv/docker/caddy/conf/Caddyfile
rename to phosphorus/etc/caddy/Caddyfile
index 8ae5255..b101d7c 100644
--- a/phosphorus/srv/docker/caddy/conf/Caddyfile
+++ b/phosphorus/etc/caddy/Caddyfile
@@ -24,7 +24,8 @@
     log {
         output file /var/log/caddy/{args[0]} {
             roll_size 10MB
-            roll_keep 3
+            roll_keep 1
+            roll_keep_for 120h # 3 days
         }
     }
 }
diff --git a/phosphorus/srv/docker/caddy/conf/sites-enabled/fedi-frontends b/phosphorus/etc/caddy/sites-enabled/fedi-frontends
similarity index 100%
rename from phosphorus/srv/docker/caddy/conf/sites-enabled/fedi-frontends
rename to phosphorus/etc/caddy/sites-enabled/fedi-frontends
diff --git a/phosphorus/srv/docker/caddy/conf/sites-enabled/iceshrimp b/phosphorus/etc/caddy/sites-enabled/iceshrimp
similarity index 100%
rename from phosphorus/srv/docker/caddy/conf/sites-enabled/iceshrimp
rename to phosphorus/etc/caddy/sites-enabled/iceshrimp
diff --git a/phosphorus/srv/docker/caddy/conf/sites-enabled/mastodon b/phosphorus/etc/caddy/sites-enabled/mastodon
similarity index 100%
rename from phosphorus/srv/docker/caddy/conf/sites-enabled/mastodon
rename to phosphorus/etc/caddy/sites-enabled/mastodon
diff --git a/phosphorus/srv/docker/caddy/conf/sites-enabled/pds b/phosphorus/etc/caddy/sites-enabled/pds
similarity index 100%
rename from phosphorus/srv/docker/caddy/conf/sites-enabled/pds
rename to phosphorus/etc/caddy/sites-enabled/pds
diff --git a/phosphorus/srv/docker/caddy/conf/sites-enabled/sharkey b/phosphorus/etc/caddy/sites-enabled/sharkey
similarity index 100%
rename from phosphorus/srv/docker/caddy/conf/sites-enabled/sharkey
rename to phosphorus/etc/caddy/sites-enabled/sharkey
diff --git a/phosphorus/srv/docker/caddy/compose.yaml b/phosphorus/srv/docker/caddy/compose.yaml
index 8471b24..aee20bc 100644
--- a/phosphorus/srv/docker/caddy/compose.yaml
+++ b/phosphorus/srv/docker/caddy/compose.yaml
@@ -7,7 +7,7 @@ services:
     cap_add:
       - NET_ADMIN
     volumes:
-      - ./conf:/etc/caddy # configurations
+      - /etc/caddy:/etc/caddy # configurations
       - ./caddy_data:/data # internal caddy data
       - ./caddy_config:/config # ^
       - /srv/docker/mastodon/public:/srv/docker/mastodon/public # mastodon web frontend