From bb4ee4a2e5dd765c656b81c6f9f25beb5ff902db Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 8 Jun 2025 22:44:32 -0500 Subject: [PATCH] feat: test --- modules/nixos/default.nix | 2 +- modules/nixos/services/jellyfin/default.nix | 130 ++++++++++---------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 05de450..88a7a44 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -77,7 +77,7 @@ in acme audiobookshelf caddy - jellyfin + # jellyfin logrotate mastodon minecraft diff --git a/modules/nixos/services/jellyfin/default.nix b/modules/nixos/services/jellyfin/default.nix index e3ff8d4..7153901 100755 --- a/modules/nixos/services/jellyfin/default.nix +++ b/modules/nixos/services/jellyfin/default.nix @@ -1,72 +1,72 @@ -# { flake, ... }: -# let -# inherit (flake.config.people) user0; -# inherit (flake.config.machines.devices) ceres; -# inherit (flake.config.services.instances) jellyfin web; -# service = jellyfin; -# localhost = web.localhost.address0; -# host = "${service.subdomain}.${web.domains.url0}"; -# in +{ flake, ... }: +let + inherit (flake.config.people) user0; + inherit (flake.config.machines.devices) ceres; + inherit (flake.config.services.instances) jellyfin web; + service = jellyfin; + localhost = web.localhost.address0; + host = "${service.subdomain}.${web.domains.url0}"; +in { - # services = { - # jellyfin = { - # enable = true; - # openFirewall = true; - # user = user0; - # }; - # jellyseerr = { - # openFirewall = true; - # enable = true; - # }; - # caddy = { - # virtualHosts = { - # "${host}" = { - # extraConfig = '' - # redir /.well-known/carddav /remote.php/dav/ 301 - # redir /.well-known/caldav /remote.php/dav/ 301 + services = { + jellyfin = { + enable = true; + openFirewall = true; + user = user0; + }; + jellyseerr = { + openFirewall = true; + enable = true; + }; + caddy = { + virtualHosts = { + "${host}" = { + extraConfig = '' + redir /.well-known/carddav /remote.php/dav/ 301 + redir /.well-known/caldav /remote.php/dav/ 301 - # reverse_proxy ${localhost}:${toString service.ports.port1} + reverse_proxy ${localhost}:${toString service.ports.port1} - # tls ${service.ssl.cert} ${service.ssl.key} - # ''; - # }; - # }; - # }; - # }; + tls ${service.ssl.cert} ${service.ssl.key} + ''; + }; + }; + }; + }; - # fileSystems = - # let - # settings = { - # fsType = "none"; - # options = [ - # "bind" - # ]; - # depends = [ - # ceres.storage0.mount - # ]; - # }; - # in - # { - # "/var/lib/${service.name}" = { - # device = service.paths.path0; - # } // settings; - # "/var/cache/${service.name}" = { - # device = "${service.paths.path1}"; - # } // settings; - # }; + fileSystems = + let + settings = { + fsType = "none"; + options = [ + "bind" + ]; + depends = [ + ceres.storage0.mount + ]; + }; + in + { + "/var/lib/${service.name}" = { + device = service.paths.path0; + } // settings; + "/var/cache/${service.name}" = { + device = "${service.paths.path1}"; + } // settings; + }; - # systemd.tmpfiles.rules = [ - # "Z ${service.paths.path0} 0755 ${user0} ${service.name} -" - # "Z ${service.paths.path1} 0755 ${user0} ${service.name} -" - # ]; + systemd.tmpfiles.rules = [ + "Z ${service.paths.path0} 0755 ${user0} ${service.name} -" + "Z ${service.paths.path0} 0755 ${user0} ${service.name} -" + ]; - # networking = { - # firewall = { - # allowedTCPPorts = [ - # service.ports.port0 - # service.ports.port1 - # service.ports.port2 - # ]; - # }; - # }; + networking = { + firewall = { + allowedTCPPorts = [ + service.ports.port0 + service.ports.port1 + service.ports.port2 + ]; + }; + }; }