From f7550aa27040bb0dfb419266394ddd48a1cd7401 Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Fri, 7 Feb 2025 01:24:49 +0000 Subject: [PATCH] Removed declarative caddyfile building Caddy doesn't seem to like symlinked config files, and home manager doesnt like producing files (even if they're read only). So, basically, the 2 technologies just dont play nice together. --- home-manager/homeserver/containers/blog.nix | 2 -- home-manager/homeserver/containers/caddy.nix | 2 -- home-manager/homeserver/containers/caddy_config/Caddyfile | 5 ----- .../containers/caddy_config/subdomains/blog.caddyfile | 3 --- .../containers/caddy_config/subdomains/freshrss.caddyfile | 3 --- .../containers/caddy_config/subdomains/site.caddyfile | 3 --- .../containers/caddy_config/subdomains/vikunja.caddyfile | 3 --- home-manager/homeserver/containers/site.nix | 2 -- home-manager/homeserver/containers/work_tools.nix | 3 --- 9 files changed, 26 deletions(-) delete mode 100644 home-manager/homeserver/containers/caddy_config/Caddyfile delete mode 100644 home-manager/homeserver/containers/caddy_config/subdomains/blog.caddyfile delete mode 100644 home-manager/homeserver/containers/caddy_config/subdomains/freshrss.caddyfile delete mode 100644 home-manager/homeserver/containers/caddy_config/subdomains/site.caddyfile delete mode 100644 home-manager/homeserver/containers/caddy_config/subdomains/vikunja.caddyfile diff --git a/home-manager/homeserver/containers/blog.nix b/home-manager/homeserver/containers/blog.nix index 8e5a123..560fdd7 100644 --- a/home-manager/homeserver/containers/blog.nix +++ b/home-manager/homeserver/containers/blog.nix @@ -44,6 +44,4 @@ }; }; }; - - home.file."caddy/config/subdomains/blog.caddyfile".source = ./caddy_config/subdomains/blog.caddyfile; } diff --git a/home-manager/homeserver/containers/caddy.nix b/home-manager/homeserver/containers/caddy.nix index a67e324..8a5246b 100644 --- a/home-manager/homeserver/containers/caddy.nix +++ b/home-manager/homeserver/containers/caddy.nix @@ -23,6 +23,4 @@ ]; }; }; - - home.file."caddy/config/Caddyfile".source = ./caddy_config/Caddyfile; } diff --git a/home-manager/homeserver/containers/caddy_config/Caddyfile b/home-manager/homeserver/containers/caddy_config/Caddyfile deleted file mode 100644 index c5eb223..0000000 --- a/home-manager/homeserver/containers/caddy_config/Caddyfile +++ /dev/null @@ -1,5 +0,0 @@ -{ - admin off -} - -import subdomains/* diff --git a/home-manager/homeserver/containers/caddy_config/subdomains/blog.caddyfile b/home-manager/homeserver/containers/caddy_config/subdomains/blog.caddyfile deleted file mode 100644 index 4a2631d..0000000 --- a/home-manager/homeserver/containers/caddy_config/subdomains/blog.caddyfile +++ /dev/null @@ -1,3 +0,0 @@ -blog.bulba.space { - reverse_proxy ghost:2368 -} diff --git a/home-manager/homeserver/containers/caddy_config/subdomains/freshrss.caddyfile b/home-manager/homeserver/containers/caddy_config/subdomains/freshrss.caddyfile deleted file mode 100644 index 2546798..0000000 --- a/home-manager/homeserver/containers/caddy_config/subdomains/freshrss.caddyfile +++ /dev/null @@ -1,3 +0,0 @@ -freshrss.bulba.space { - reverse_proxy freshrss:80 -} diff --git a/home-manager/homeserver/containers/caddy_config/subdomains/site.caddyfile b/home-manager/homeserver/containers/caddy_config/subdomains/site.caddyfile deleted file mode 100644 index 3e46b9f..0000000 --- a/home-manager/homeserver/containers/caddy_config/subdomains/site.caddyfile +++ /dev/null @@ -1,3 +0,0 @@ -bulba.space { - reverse_proxy bulbaspace-site:80 -} diff --git a/home-manager/homeserver/containers/caddy_config/subdomains/vikunja.caddyfile b/home-manager/homeserver/containers/caddy_config/subdomains/vikunja.caddyfile deleted file mode 100644 index a6fb8e2..0000000 --- a/home-manager/homeserver/containers/caddy_config/subdomains/vikunja.caddyfile +++ /dev/null @@ -1,3 +0,0 @@ -vikunja.bulba.space { - reverse_proxy vikunja:3456 -} diff --git a/home-manager/homeserver/containers/site.nix b/home-manager/homeserver/containers/site.nix index b1eefe4..b8d5648 100644 --- a/home-manager/homeserver/containers/site.nix +++ b/home-manager/homeserver/containers/site.nix @@ -17,6 +17,4 @@ ]; }; }; - - home.file."caddy/config/subdomains/site.caddyfile".source = ./caddy_config/subdomains/site.caddyfile; } diff --git a/home-manager/homeserver/containers/work_tools.nix b/home-manager/homeserver/containers/work_tools.nix index c925123..e147694 100644 --- a/home-manager/homeserver/containers/work_tools.nix +++ b/home-manager/homeserver/containers/work_tools.nix @@ -78,7 +78,4 @@ }; }; }; - - home.file."caddy/config/subdomains/vikunja.caddyfile".source = ./caddy_config/subdomains/vikunja.caddyfile; - home.file."caddy/config/subdomains/freshrss.caddyfile".source = ./caddy_config/subdomains/freshrss.caddyfile; }