Fixed prowlarr/cross-seed groups

rasmus-kirk · Mar 1, 2024 · a3ddf00 · a3ddf00
1 parent d396bd3
commit a3ddf00
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/nixarr/prowlarr/default.nix b/nixarr/prowlarr/default.nix
@@ -48,8 +48,6 @@ in {
       "d '${cfg.stateDir}' 0700 prowlarr root - -"
     ];
 
-    users.groups.prowlarr = {};
-
     util-nixarr.services.prowlarr = {
       enable = true;
       dataDir = cfg.stateDir;

diff --git a/nixarr/prowlarr/prowlarr-module/default.nix b/nixarr/prowlarr/prowlarr-module/default.nix
@@ -70,6 +70,8 @@ in {
       };
     };
 
-    users.groups = mkIf (cfg.group == "prowlarr") {};
+    users.groups = mkIf (cfg.group == "prowlarr") {
+      prowlarr = { };
+    };
   };
 }
diff --git a/nixarr/transmission/cross-seed/default.nix b/nixarr/transmission/cross-seed/default.nix
@@ -6,9 +6,9 @@
 }:
 with lib; let
   cfg = config.util-nixarr.services.cross-seed;
-  settingsFormat = pkgs.formats.json {};
-  settingsFile = settingsFormat.generate "settings.json" cfg.settings;
-  cross-seedPkg = import ../../../pkgs/cross-seed { inherit (pkgs) stdenv lib fetchFromGitHub; };
+  #settingsFormat = pkgs.formats.json {};
+  #settingsFile = settingsFormat.generate "settings.json" cfg.settings;
+  #cross-seedPkg = import ../../../pkgs/cross-seed { inherit (pkgs) stdenv lib fetchFromGitHub; };
 in {
   options = {
     util-nixarr.services.cross-seed = {
@@ -61,19 +61,20 @@ in {
       after = ["network.target"];
       wantedBy = ["multi-user.target"];
 
-      environment.CONFIG_DIR = cfg.dataDir;
+      #environment.CONFIG_DIR = cfg.dataDir;
 
       serviceConfig = {
         # Run as root in case that the cfg.credentialsFile is not readable by cross-seed
-        ExecStartPre = [("+" + pkgs.writeShellScript "transmission-prestart" ''
-          ${pkgs.jq}/bin/jq --slurp add ${settingsFile} '${cfg.credentialsFile}' |
-          install -D -m 600 -o '${cfg.user}' /dev/stdin '${cfg.dataDir}/config.json'
-        ''
-        )];
+        #ExecStartPre = [("+" + pkgs.writeShellScript "transmission-prestart" ''
+        #  ${pkgs.jq}/bin/jq --slurp add ${settingsFile} '${cfg.credentialsFile}' |
+        #  install -D -m 600 -o '${cfg.user}' /dev/stdin '${cfg.dataDir}/config.json'
+        #''
+        #)];
         Type = "simple";
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${getExe cross-seedPkg} daemon";
+        #ExecStart = "${cross-seedPkg}/bin/cross-seed daemon";
+        ExecStart = "${pkgs.cowsay}/bin/cowsay";
         Restart = "on-failure";
       };
     };
@@ -85,6 +86,8 @@ in {
       };
     };
 
-    users.groups = mkIf (cfg.group == "cross-seed") {};
+    users.groups = mkIf (cfg.group == "cross-seed") {
+      cross-seed = { };
+    };
   };
 }
diff --git a/nixarr/transmission/default.nix b/nixarr/transmission/default.nix
@@ -9,7 +9,7 @@ with lib; let
   nixarr = config.nixarr;
   cfg-cross-seed = config.nixarr.transmission.privateTrackers.cross-seed;
   transmissionCrossSeedScript = with builtins; pkgs.writeShellApplication {
-    name = "mk-cross-seed-credentials";
+    name = "transmission-cross-seed-script";
 
     runtimeInputs = with pkgs; [ curl ];
 
@@ -270,7 +270,9 @@ in {
           anti-brute-force-threshold = 10;
 
           script-torrent-done-enabled = cfg-cross-seed.enable;
-          script-torrent-done-filename = if cfg-cross-seed.enable then transmissionCrossSeedScript else null;
+          script-torrent-done-filename = if cfg-cross-seed.enable then 
+            "${transmissionCrossSeedScript}/bin/transmission-cross-seed-script"
+          else null;
 
           message-level =
             if cfg.messageLevel == "none"