clean up caddy config options for services

1 files changed, 8 insertions, 8 deletions

diff --git a/modules/services/nixos/mkCaddyCfg.nix b/modules/services/nixos/mkCaddyCfg.nix
index d7b74c0..f13e40a 100644
--- a/modules/services/nixos/mkCaddyCfg.nix
+++ b/modules/services/nixos/mkCaddyCfg.nix
@@ -1,32 +1,32 @@
 cfg: {
   networking.extraHosts =
-    if cfg.caddy.local.enable
+    if cfg.privateURL
     then ''
-      127.0.0.1 ${cfg.service_name}.collinux
+      127.0.0.1 ${cfg.privateURL}
     ''
     else "";
 
   services.caddy.virtualHosts =
     (
-      if cfg.caddy.global.enable && (cfg.root_url != null)
+      if cfg.publicURL
       then {
-        ${cfg.root_url}.extraConfig = ''
+        ${cfg.publicURL}.extraConfig = ''
           ${
             if cfg.caddy.bind_tailscale
             then "bind tailscale/${cfg.service_name}"
             else ""
           }
-          reverse_proxy ${cfg.bind_host}:${toString cfg.port}
+          reverse_proxy ${cfg.listenAddr}:${toString cfg.port}
         '';
       }
       else {}
     )
     // (
-      if cfg.caddy.local.enable
+      if cfg.caddy.privateURL
       then {
-        "${cfg.service_name}.collinux".extraConfig = ''
+        "${cfg.privateURL}.collinux".extraConfig = ''
           tls internal
-          reverse_proxy ${cfg.bind_host}:${toString cfg.port}
+          reverse_proxy ${cfg.listenAddr}:${toString cfg.port}
         '';
       }
       else {}