PR feedback: Replace pkg variable, move package statement

This commit is contained in:
Jozef Hollý
2024-11-09 13:06:56 +01:00
committed by GitHub
parent e8a9775a61
commit a96dce89d0

View File

@@ -4,7 +4,6 @@ with lib;
let let
cfg = config.services.nzbget; cfg = config.services.nzbget;
pkg = cfg.package;
stateDir = "/var/lib/nzbget"; stateDir = "/var/lib/nzbget";
configFile = "${stateDir}/nzbget.conf"; configFile = "${stateDir}/nzbget.conf";
configOpts = concatStringsSep " " (mapAttrsToList (name: value: "-o ${name}=${escapeShellArg (toStr value)}") cfg.settings); configOpts = concatStringsSep " " (mapAttrsToList (name: value: "-o ${name}=${escapeShellArg (toStr value)}") cfg.settings);
@@ -27,6 +26,8 @@ in
services.nzbget = { services.nzbget = {
enable = mkEnableOption (lib.mdDoc "NZBGet"); enable = mkEnableOption (lib.mdDoc "NZBGet");
package = mkPackageOption pkgs "nzbget" { };
user = mkOption { user = mkOption {
type = types.str; type = types.str;
default = "nzbget"; default = "nzbget";
@@ -51,8 +52,6 @@ in
MainDir = "/data"; MainDir = "/data";
}; };
}; };
package = mkPackageOption pkgs "nzbget" { };
}; };
}; };
@@ -69,8 +68,8 @@ in
InfoTarget = "screen"; InfoTarget = "screen";
DetailTarget = "screen"; DetailTarget = "screen";
# required paths # required paths
ConfigTemplate = "${pkg}/share/nzbget/nzbget.conf"; ConfigTemplate = "${cfg.package}/share/nzbget/nzbget.conf";
WebDir = "${pkg}/share/nzbget/webui"; WebDir = "${cfg.package}/share/nzbget/webui";
# nixos handles package updates # nixos handles package updates
UpdateCheck = "none"; UpdateCheck = "none";
}; };
@@ -86,7 +85,7 @@ in
preStart = '' preStart = ''
if [ ! -f ${configFile} ]; then if [ ! -f ${configFile} ]; then
${pkgs.coreutils}/bin/install -m 0700 ${pkg}/share/nzbget/nzbget.conf ${configFile} ${pkgs.coreutils}/bin/install -m 0700 ${cfg.package}/share/nzbget/nzbget.conf ${configFile}
fi fi
''; '';
@@ -97,8 +96,8 @@ in
Group = cfg.group; Group = cfg.group;
UMask = "0002"; UMask = "0002";
Restart = "on-failure"; Restart = "on-failure";
ExecStart = "${pkg}/bin/nzbget --server --configfile ${stateDir}/nzbget.conf ${configOpts}"; ExecStart = "${cfg.package}/bin/nzbget --server --configfile ${stateDir}/nzbget.conf ${configOpts}";
ExecStop = "${pkg}/bin/nzbget --quit"; ExecStop = "${cfg.package}/bin/nzbget --quit";
}; };
}; };