diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix index 711722e..89ee06b 100644 --- a/modules/jellyfin.nix +++ b/modules/jellyfin.nix @@ -16,20 +16,27 @@ in { virtualisation.oci-containers.containers.jellyfin = { - #image = "docker.io/jellyfin/jellyfin"; - image = "ghcr.io/confusedpolarbear/jellyfin-intro-skipper"; - extraOptions = cfg.podman.extraOptions; - ports = [ "${port}:${port}" ]; + image = "docker.io/jellyfin/jellyfin"; + #image = "ghcr.io/confusedpolarbear/jellyfin-intro-skipper"; + extraOptions = cfg.podman.extraOptions ++ [ + "--group-add=303" + "--device=/dev/dri/renderD128:/dev/dri/renderD128" + "--health-startup-cmd=curl -Lk -fsS http://localhost:8096/health || exit 1" + "--health-start-period=30s" + ]; + ports = [ + "${port}:${port}" + "1900:1900/udp" + "7359:7359/udp" + ]; volumes = [ "/var/lib/jellyfin:/config" - "/mnt/cache/jellyfin:/cache" - "/mnt/gdrive:/mnt/gdrive:ro" - #"/mnt/gdrive:/mnt/gdrive" + "/mnt/cache/jellyfin/metadata:/config/metadata" + "/mnt/cache/jellyfin/cache:/cache" + "/mnt/mergerfs/media:/media:ro" + "/mnt/mergerfs/recorded:/recorded" ]; - }; - - systemd.services.podman-jellyfin = { - after = [ "gdrive_mount.service" ]; + autoStart = false; }; imports = [ ./nginx.nix ]; diff --git a/modules/vars.nix b/modules/vars.nix index fe58099..d9ad56d 100644 --- a/modules/vars.nix +++ b/modules/vars.nix @@ -52,7 +52,7 @@ }; jellyfin = { - domain = "jftest.mc-fucker.cool"; + domain = "jf.mc-fucker.cool"; port = "8096"; };