rename/refactor caddy module

hosts/crossbell/default.nix

···
     { config, lib, ... }:
     {
       imports = [
-        inputs.self.modules.nixos.server
+        inputs.srvos.nixosModules.server
         inputs.srvos.nixosModules.hardware-vultr-vm
       ];
 
···
         enable = false;
       };
 
-      local.caddy-gateway = {
+      local.caddy = {
         virtualHosts = {
           "www.peterrice.xyz".extraConfig = "redir https://pvsr.dev";
           "www.pvsr.dev".extraConfig = "redir https://pvsr.dev";

hosts/ruan/default.nix

···
     {
       imports = [
         inputs.self.modules.nixos.desktop
-        inputs.self.modules.nixos.gateway
         inputs.weather.nixosModules.default
         inputs.podcasts.nixosModules.default
       ];

hosts/ruan/forgejo.nix

···
         hostPath = "/run/forgejo";
         isReadOnly = false;
       };
-      local.caddy-gateway.internalProxies."code.pvsr.dev" = "unix//run/forgejo/forgejo.sock";
+      local.caddy.internalProxies."code.pvsr.dev" = "unix//run/forgejo/forgejo.sock";
 
       networking.firewall.allowedTCPPorts = [ 32230 ];
 

modules/caddy.nix

···
+{ lib, ... }:
+{
+  flake.modules.nixos.core =
+    { config, pkgs, ... }:
+    let
+      cfg = config.local.caddy;
+      enable = cfg.virtualHosts != { } || cfg.reverseProxies != { } || cfg.internalProxies != { };
+    in
+    {
+      options.local.caddy = {
+        virtualHosts = lib.mkOption { default = { }; };
+        reverseProxies = lib.mkOption { default = { }; };
+        internalProxies = lib.mkOption { default = { }; };
+      };
+
+      config = lib.mkIf enable {
+        services.caddy = {
+          enable = true;
+          package = pkgs.caddy.withPlugins {
+            plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
+            # TODO sucks
+            hash = "sha256-Dvifm7rRwFfgXfcYvXcPDNlMaoxKd5h4mHEK6kJ+T4A=";
+          };
+          enableReload = true;
+          globalConfig = ''
+            admin :40013
+            metrics {
+              per_host
+            }
+          '';
+          virtualHosts =
+            cfg.virtualHosts
+            // builtins.mapAttrs (_: dest: { extraConfig = "reverse_proxy ${dest}"; }) cfg.reverseProxies
+            // builtins.mapAttrs (_: dest: {
+              extraConfig = ''
+                reverse_proxy ${dest}
+                tls {
+                  dns cloudflare {env.DNS_API_TOKEN}
+                  resolvers 185.71.138.138
+                }
+              '';
+            }) cfg.internalProxies;
+        };
+
+        environment.persistence.nixos.directories = [ "/var/lib/caddy" ];
+
+        networking.firewall.allowedTCPPorts = [
+          80
+          443
+        ];
+        networking.firewall.interfaces.tailscale0.allowedTCPPorts = [ 40013 ];
+      };
+    };
+}

modules/gateway.nix

···
-{ lib, ... }:
-{
-  flake.modules.nixos.gateway =
-    { config, pkgs, ... }:
-    let
-      cfg = config.local.caddy-gateway;
-    in
-    {
-      options.local.caddy-gateway = {
-        virtualHosts = lib.mkOption { default = { }; };
-        reverseProxies = lib.mkOption { default = { }; };
-        internalProxies = lib.mkOption { default = { }; };
-      };
-
-      config.environment.persistence.nixos.directories = [ "/var/lib/caddy" ];
-
-      config.services.caddy = {
-        enable = true;
-        package = pkgs.caddy.withPlugins {
-          plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-          # TODO sucks
-          hash = "sha256-Dvifm7rRwFfgXfcYvXcPDNlMaoxKd5h4mHEK6kJ+T4A=";
-        };
-        enableReload = true;
-        globalConfig = ''
-          admin :40013
-          metrics {
-            per_host
-          }
-        '';
-        virtualHosts =
-          cfg.virtualHosts
-          // builtins.mapAttrs (_: dest: { extraConfig = "reverse_proxy ${dest}"; }) cfg.reverseProxies
-          // builtins.mapAttrs (_: dest: {
-            extraConfig = ''
-              reverse_proxy ${dest}
-              tls {
-                dns cloudflare {env.DNS_API_TOKEN}
-                resolvers 185.71.138.138
-              }
-            '';
-          }) cfg.internalProxies;
-      };
-
-      config.networking.firewall.allowedTCPPorts = [
-        80
-        443
-      ];
-
-      config.networking.firewall.interfaces.tailscale0.allowedTCPPorts = [ 40013 ];
-    };
-}

modules/guest.nix

···
 in
 {
   flake.modules.nixos.crossbell = {
-    local.caddy-gateway.reverseProxies."griffin.pvsr.dev" = "ruan.ts.peterrice.xyz:12548";
+    local.caddy.reverseProxies."griffin.pvsr.dev" = "ruan.ts.peterrice.xyz:12548";
     networking.nftables.tables.griffin = {
       family = "ip";
       content = forward12262 hosts.ruan.config.local.tailscale.ip 12262;
···
   };
 
   flake.modules.nixos.ruan = {
-    local.caddy-gateway.reverseProxies.":12548" = guest;
+    local.caddy.reverseProxies.":12548" = guest;
     networking.nftables.tables.griffin = {
       family = "ip";
       content = forward12262 guest 22;

modules/metrics.nix

···
         );
     in
     {
-      local.caddy-gateway.internalProxies."grafana.peterrice.xyz" = "localhost:10508";
+      local.caddy.internalProxies."grafana.peterrice.xyz" = "localhost:10508";
       environment.persistence.nixos.directories = [
         "/var/lib/grafana"
         "/var/lib/private/victoriametrics"
···
             {
               job_name = "caddy";
               static_configs = [
-                { targets = mkTargets (host: host.config.local ? caddy-gateway) "40013"; }
+                { targets = mkTargets (host: host.config.local ? caddy) "40013"; }
               ];
             }
             {

modules/server.nix

···
-{ inputs, ... }:
-{
-  flake.modules.nixos.server.imports = [
-    inputs.srvos.nixosModules.server
-    inputs.self.modules.nixos.gateway
-  ];
-}