move caddy config into separate file

modules/services/caddy.nix

@@ -0,0 +1,26 @@
+{ config, pkgs, lib, ... }:
+
+let
+
+in {
+
+  options = {
+    caddyServers = lib.mkOption {
+      type = lib.types.attrs;
+      description = "Caddy JSON configs for http servers";
+    };
+  };
+
+  config = {
+
+    services.caddy = {
+      enable = true;
+      adapter = "''"; # Required to enable JSON
+      configFile = pkgs.writeText "Caddyfile"
+        (builtins.toJSON { apps.http.servers = config.caddyServers; });
+
+    };
+
+  };
+
+}

modules/services/calibre.nix

@@ -7,6 +7,8 @@ let
 
 in {
 
+  imports = [ ./caddy.nix ];
+
   options = {
     bookServer = lib.mkOption {
       type = lib.types.str;
@@ -26,25 +28,16 @@ in {
       };
     };
 
-    services.caddy = {
+    caddyServers.calibre = {
-      enable = true;
+      listen = [ ":443" ];
-      adapter = "''"; # Required to enable JSON
+      routes = [{
-      configFile = pkgs.writeText "Caddyfile" (builtins.toJSON {
+        match = [{ host = [ config.bookServer ]; }];
-        apps.http.servers = {
+        handle = [{
-          calibre = {
+          handler = "reverse_proxy";
-            listen = [ ":443" ];
+          upstreams = [{ dial = "localhost:8083"; }];
-            routes = [{
+          headers.request.add."X-Script-Name" = [ "/calibre-web" ];
-              match = [{ host = [ config.bookServer ]; }];
+        }];
-              handle = [{
+      }];
-                handler = "reverse_proxy";
-                upstreams = [{ dial = "localhost:8083"; }];
-                headers.request.add."X-Script-Name" = [ "/calibre-web" ];
-              }];
-            }];
-          };
-        };
-      });
-
     };
 
     networking.firewall.interfaces.calibre = { allowedTCPPorts = [ 80 443 ]; };