From d2747292dff98c64b974bdfe6b46bc62252298de Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Mon, 23 Feb 2026 15:09:58 -0600
Subject: clean up services

---
 modules/services/nixos/mkCaddyCfg.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'modules/services/nixos/mkCaddyCfg.nix')

diff --git a/modules/services/nixos/mkCaddyCfg.nix b/modules/services/nixos/mkCaddyCfg.nix
index 770b4d0..02b9a0a 100644
--- a/modules/services/nixos/mkCaddyCfg.nix
+++ b/modules/services/nixos/mkCaddyCfg.nix
@@ -1,18 +1,19 @@
-cfg: {
+cfg: let
+  caddyConfig =
+    if cfg ? reverseProxy && cfg.reverseProxy == true
+    then ''reverse_proxy ${cfg.listenAddr}:${toString cfg.port}''
+    else cfg.manualCaddyConfig;
+in {
   networking.extraHosts =
     if cfg.privateUrl != null
-    then ''
-      127.0.0.1 ${cfg.privateUrl}
-    ''
+    then "127.0.0.1 ${cfg.privateUrl}"
     else "";
 
   services.caddy.virtualHosts =
     (
       if cfg.publicUrl != null
       then {
-        ${cfg.publicUrl}.extraConfig = ''
-          reverse_proxy ${cfg.listenAddr}:${toString cfg.port}
-        '';
+        ${cfg.publicUrl}.extraConfig = caddyConfig;
       }
       else {}
     )
@@ -21,7 +22,7 @@ cfg: {
       then {
         "${cfg.privateUrl}".extraConfig = ''
           tls internal
-          reverse_proxy ${cfg.listenAddr}:${toString cfg.port}
+          ${caddyConfig}
         '';
       }
       else {}
-- 
cgit v1.3.1