Switch to linuxserver jellyfin image

hosts/franz/arion/media/arion-compose.nix

@@ -6,13 +6,42 @@
     external = true;
   };
 
-  docker-compose.volumes = {
-    jellyfin_cache = null;
-  };
-
   services = {
+    # jellyfin-old.service = {
+    #   image = "jellyfin/jellyfin:2024032802";
+    #   container_name = "jellyfin-old";
+    #   ports = [
+    #     "8097:8096"
+    #   ];
+    #   labels = {
+    #     "traefik.enable" = "true";
+    #     "traefik.http.routers.jellyfin.entrypoints" = "websecure";
+    #     "traefik.http.routers.jellyfin.rule" = "Host(`jellyfin.ghoscht.com`)";
+    #     "traefik.http.services.jellyfin.loadbalancer.server.port" = "8096";
+    #     "traefik.http.services.jellyfin.loadbalancer.passHostHeader" = "true";
+    #     "traefik.http.routers.jellyfin.tls" = "true";
+    #     "traefik.http.routers.jellyfin.tls.certresolver" = "letsencrypt";
+    #   };
+    #   volumes = [
+    #     # "jellyfin_cache:/cache"
+    #     "/storage/dataset/docker/media/jellyfin_data:/config"
+    #     "/storage/dataset/data/media/tv:/tv"
+    #     "/storage/dataset/data/media/anime:/anime"
+    #     "/storage/dataset/data/media/movies:/movies"
+    #   ];
+    #   environment = {
+    #     PUID = 1000;
+    #     PGID = 1000;
+    #     TZ = "Europe/Berlin";
+    #   };
+    #   dns = ["1.1.1.1"];
+    #   restart = "always";
+    #   networks = [
+    #     "dmz"
+    #   ];
+    # };
     jellyfin.service = {
-      image = "jellyfin/jellyfin:2024032802";
+      image = "linuxserver/jellyfin:10.8.13";
       container_name = "jellyfin";
       ports = [
         "8096:8096"
@@ -27,7 +56,6 @@
         "traefik.http.routers.jellyfin.tls.certresolver" = "letsencrypt";
       };
       volumes = [
-        "jellyfin_cache:/cache"
         "/storage/dataset/docker/media/jellyfin_data:/config"
         "/storage/dataset/data/media/tv:/tv"
         "/storage/dataset/data/media/anime:/anime"

hosts/franz/restic.nix

@@ -5,26 +5,42 @@
 }: let
   vars = import ../../vars.nix;
   arionPath = "/home/${vars.user}/.setup/hosts/franz/arion";
+  cfg = config.virtualisation.arion;
 in {
-  systemd.timers."restic-cron" = {
+  # systemd.timers."restic-cron" = {
-    wantedBy = ["timers.target"];
+  #   wantedBy = ["timers.target"];
-    timerConfig = {
+  #   timerConfig = {
-      OnBootSec = "5m";
+  #     OnBootSec = "1m";
-      OnUnitActiveSec = "5m";
+  #     OnUnitActiveSec = "1m";
-      Unit = "restic-cron.service";
+  #     Unit = "restic-cron.service";
-    };
+  #   };
+  # };
+  #
+  # systemd.services."restic-cron" = {
+  #   path = [
+  #     cfg.docker.client.package
+  #     cfg.package
+  #     pkgs.nix
+  #     pkgs.restic
+  #     pkgs.autorestic
+  #   ];
+  #   script = ''
+  #     source /etc/profile
+  #     autorestic -c /home/ghoscht/.autorestic.yml --verbose cron >> /tmp/autorestic.log 2>&1
+  #   '';
+  #   serviceConfig = {
+  #     Type = "oneshot";
+  #     User = "root";
+  #   };
+  # };
+
+  services.cron = {
+    enable = true;
+    systemCronJobs = [
+      "*/5 * * * *      root    . /etc/profile; autorestic -c /home/ghoscht/.autorestic.yml --ci cron"
+    ];
   };
 
-  systemd.services."restic-cron" = {
-    script = ''
-      set -eu
-      ${pkgs.autorestic}/bin/autorestic -c /home/ghoscht/.autorestic.yml --restic-bin ${pkgs.restic}/bin/restic --ci cron > /tmp/autorestic.log 2>&1
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-    };
-  };
   environment.systemPackages = with pkgs; [autorestic restic];
 
   sops.secrets."autorestic/zfs_key" = {
@@ -49,35 +65,32 @@ in {
           from: /storage/dataset/docker/dashboard
           to:
             - zfs
-            - ssd
           cron: '0 3 * * 0' # Every Sunday at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/dashboard/arion-compose.nix -p ${arionPath}/dashboard/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/dashboard/arion-compose.nix -p ${arionPath}/dashboard/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/dashboard/arion-compose.nix -p ${arionPath}/dashboard/arion-pkgs.nix start
+              -  arion -f ${arionPath}/dashboard/arion-compose.nix -p ${arionPath}/dashboard/arion-pkgs.nix start
         dns:
           from: /storage/dataset/docker/dns
           to:
             - zfs
-            - ssd
           cron: '0 3 * * 0' # Every Sunday at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/dns/arion-compose.nix -p ${arionPath}/dns/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/dns/arion-compose.nix -p ${arionPath}/dns/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/dns/arion-compose.nix -p ${arionPath}/dns/arion-pkgs.nix start
+              -  arion -f ${arionPath}/dns/arion-compose.nix -p ${arionPath}/dns/arion-pkgs.nix start
         feed:
           from: /storage/dataset/docker/feed
           to:
             - zfs
-            - ssd
           cron: '0 3 * * 0' # Every Sunday at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/feed/arion-compose.nix -p ${arionPath}/feed/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/feed/arion-compose.nix -p ${arionPath}/feed/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/feed/arion-compose.nix -p ${arionPath}/feed/arion-pkgs.nix start
+              -  arion -f ${arionPath}/feed/arion-compose.nix -p ${arionPath}/feed/arion-pkgs.nix start
         git:
           from: /storage/dataset/docker/git
           to:
@@ -86,20 +99,19 @@ in {
           cron: '0 3 * * *' # Every Day at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/git/arion-compose.nix -p ${arionPath}/git/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/git/arion-compose.nix -p ${arionPath}/git/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/git/arion-compose.nix -p ${arionPath}/git/arion-pkgs.nix start
+              -  arion -f ${arionPath}/git/arion-compose.nix -p ${arionPath}/git/arion-pkgs.nix start
         media:
           from: /storage/dataset/docker/media
           to:
             - zfs
-            - ssd
+          cron: '0 3 * * *' # Every Day at 3:00
-          cron: '0 3 * * 0' # Every Sunday at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/media/arion-compose.nix -p ${arionPath}/media/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/media/arion-compose.nix -p ${arionPath}/media/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/media/arion-compose.nix -p ${arionPath}/media/arion-pkgs.nix start
+              -  arion -f ${arionPath}/media/arion-compose.nix -p ${arionPath}/media/arion-pkgs.nix start
         nextcloud:
           from: /storage/dataset/docker/nextcloud
           to:
@@ -108,20 +120,19 @@ in {
           cron: '0 3 * * *' # Every Day at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/nextcloud/arion-compose.nix -p ${arionPath}/nextcloud/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/nextcloud/arion-compose.nix -p ${arionPath}/nextcloud/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/nextcloud/arion-compose.nix -p ${arionPath}/nextcloud/arion-pkgs.nix start
+              -  arion -f ${arionPath}/nextcloud/arion-compose.nix -p ${arionPath}/nextcloud/arion-pkgs.nix start
         smarthome:
           from: /storage/dataset/docker/smarthome
           to:
             - zfs
-            - ssd
           cron: '0 3 * * 0' # Every Sunday at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/smarthome/arion-compose.nix -p ${arionPath}/smarthome/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/smarthome/arion-compose.nix -p ${arionPath}/smarthome/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/smarthome/arion-compose.nix -p ${arionPath}/smarthome/arion-pkgs.nix start
+              -  arion -f ${arionPath}/smarthome/arion-compose.nix -p ${arionPath}/smarthome/arion-pkgs.nix start
         passwords:
           from: /storage/dataset/docker/passwords
           to:
@@ -130,9 +141,9 @@ in {
           cron: '0 3 * * *' # Every Day at 3:00
           hooks:
             before:
-              - sudo arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix stop
+              -  arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix stop
             after:
-              - sudo arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix start
+              -  arion -f ${arionPath}/passwords/arion-compose.nix -p ${arionPath}/passwords/arion-pkgs.nix start
       backends:
         zfs:
           type: local