From ae3d889262109e130586c4fda5de79c7e51cc7ac Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Tue, 28 Dec 2021 22:02:24 +0100
Subject: [PATCH] Refactoring of the mediaserver module

---
 modules/jackett/default.nix      |  2 ++
 modules/jellyfin/default.nix     |  4 ++--
 modules/mediaserver/default.nix  | 21 ++++++++++++++++-----
 modules/radarr/default.nix       |  7 ++-----
 modules/sonarr/default.nix       |  4 ++--
 modules/transmission/default.nix | 20 ++++++++++++++------
 6 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/modules/jackett/default.nix b/modules/jackett/default.nix
index 42700ca..9e665c0 100644
--- a/modules/jackett/default.nix
+++ b/modules/jackett/default.nix
@@ -17,6 +17,8 @@ in {
     mkMerge [{ 
     services.jackett = {
       enable = true;
+      user = "mediaserver";
+      group = "mediaserver";
     };
   } 
 
diff --git a/modules/jellyfin/default.nix b/modules/jellyfin/default.nix
index 8429677..d8684a9 100644
--- a/modules/jellyfin/default.nix
+++ b/modules/jellyfin/default.nix
@@ -17,10 +17,10 @@ in {
     mkMerge [{ 
     services.jellyfin = {
       enable = true;
-      group = "tv";
+      user = "mediaserver";
+      group = "mediaserver";
       package = pkgs.jellyfin; 
     };
-    users.groups.tv = { name = "tv"; };
   } 
 
     (mkIf cfg.nginx.enable {
diff --git a/modules/mediaserver/default.nix b/modules/mediaserver/default.nix
index 072e6a3..1d432ff 100644
--- a/modules/mediaserver/default.nix
+++ b/modules/mediaserver/default.nix
@@ -9,6 +9,17 @@ in {
 
   config = mkIf cfg.enable {
 
+    users.users.mediaserver = {
+      name = "mediaserver";
+      isNormalUser = true;
+      home = "/home/mediaserver";
+      group = config.users.groups.mediaserver.name;
+    };
+
+    users.groups.mediaserver = {
+      name = "mediaserver";
+    };
+
 
     luj.sonarr = {
       enable = true;
@@ -34,11 +45,11 @@ in {
       nginx.subdomain = "jackett";
     };
 
-    #luj.transmission = {
-    #  enable = true;
-    #  nginx.enable = true;
-    #  nginx.subdomain = "downloads";
-    #};
+    luj.transmission = {
+      enable = true;
+      nginx.enable = true;
+      nginx.subdomain = "downloads";
+    };
   };
 
 }
diff --git a/modules/radarr/default.nix b/modules/radarr/default.nix
index bbb4980..adcf204 100644
--- a/modules/radarr/default.nix
+++ b/modules/radarr/default.nix
@@ -17,12 +17,9 @@ in {
     mkMerge [{ 
     services.radarr = {
       enable = true;
-      #user = "transmission";
-      #group = "transmission";
-      #dataDir = "/var/lib/sonarr/.config/NzbDrone";
-      group = "tv";
+      user = "mediaserver";
+      group = "mediaserver";
     };
-    users.groups.tv = { name = "tv"; };
   } 
 
     (mkIf cfg.nginx.enable {
diff --git a/modules/sonarr/default.nix b/modules/sonarr/default.nix
index 3ab7c46..e01e83a 100644
--- a/modules/sonarr/default.nix
+++ b/modules/sonarr/default.nix
@@ -17,9 +17,9 @@ in {
     mkMerge [{ 
     services.sonarr = {
       enable = true;
-      group = "tv";
+      user = "mediaserver";
+      group = "mediaserver";
     };
-    users.groups.tv = { name = "tv"; };
   } 
 
     (mkIf cfg.nginx.enable {
diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix
index 34219f0..59620c0 100644
--- a/modules/transmission/default.nix
+++ b/modules/transmission/default.nix
@@ -15,19 +15,27 @@ in {
 
   config = mkIf cfg.enable (
     mkMerge [{ 
+
+
+    sops.secrets.transmission = {
+      owner = "mediaserver";
+      format = "binary";
+      sopsFile = ../../secrets/transmission-login;
+    };
+
     services.transmission = {
       enable = true;
-      group = "tv";
-      downloadDirPermissions = "774";
+      user = "mediaserver";
+      group = "mediaserver";
+      credentialsFile = "/run/secrets/transmission";
+      downloadDirPermissions = "770";
       settings = {
         rpc-port = 9091;
-        download-dir = "/home/transmission/Downloads/";
-        incomplete-dir = "/home/transmission/Incomplete/";
+        download-dir = "/home/mediaserver/downloads/complete/";
+        incomplete-dir = "/home/mediaserver/downloads/incomplete/";
         incomplete-dir-enable = true;
       };
-
     };
-    users.groups.tv = { name = "tv"; };
   } 
 
     (mkIf cfg.nginx.enable {