add jellyfin, switch caddy to one listener

hosts/oracle/default.nix

@@ -10,6 +10,7 @@ nixpkgs.lib.nixosSystem {
     {
       networking.hostName = "oracle";
       bookServer = "books.masu.rs";
+      streamServer = "stream.masu.rs";
       gui.enable = false;
       colorscheme = (import ../../modules/colorscheme/gruvbox);
       passwordHash = null;
@@ -23,5 +24,6 @@ nixpkgs.lib.nixosSystem {
     ../../modules/services/oracle.nix
     ../../modules/services/sshd.nix
     ../../modules/services/calibre.nix
+    ../../modules/services/jellyfin.nix
   ];
 }

modules/services/caddy.nix

@@ -5,9 +5,9 @@ let
 in {
 
   options = {
-    caddyServers = lib.mkOption {
-      type = lib.types.attrs;
-      description = "Caddy JSON configs for http servers";
+    caddyRoutes = lib.mkOption {
+      type = lib.types.listOf lib.types.attrs;
+      description = "Caddy JSON routes for http servers";
     };
   };
 
@@ -16,8 +16,12 @@ in {
     services.caddy = {
       enable = true;
       adapter = "''"; # Required to enable JSON
-      configFile = pkgs.writeText "Caddyfile"
-        (builtins.toJSON { apps.http.servers = config.caddyServers; });
+      configFile = pkgs.writeText "Caddyfile" (builtins.toJSON {
+        apps.http.servers.main = {
+          listen = [ ":443" ];
+          routes = config.caddyRoutes;
+        };
+      });
 
     };
 

modules/services/calibre.nix

@@ -28,17 +28,14 @@ in {
       };
     };
 
-    caddyServers.calibre = {
-      listen = [ ":443" ];
-      routes = [{
-        match = [{ host = [ config.bookServer ]; }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = "localhost:8083"; }];
-          headers.request.add."X-Script-Name" = [ "/calibre-web" ];
-        }];
+    caddyRoutes = [{
+      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 ]; };
 

modules/services/jellyfin.nix

@@ -0,0 +1,23 @@
+{ config, lib, ... }: {
+
+  options = {
+    streamServer = lib.mkOption {
+      type = lib.types.str;
+      description = "Hostname for Jellyfin library";
+    };
+  };
+
+  config = {
+
+    services.jellyfin.enable = true;
+
+    caddyRoutes = [{
+      match = [{ host = [ config.streamServer ]; }];
+      handle = [{
+        handler = "reverse_proxy";
+        upstreams = [{ dial = "localhost:8096"; }];
+      }];
+    }];
+  };
+
+}