diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-09 15:46:00 +0200 |
| commit | 74c24385cb2864f937031df74af14fc8060e1540 (patch) | |
| tree | 5524856cfa11a449f4bef972fbc994bec6ff44cf /nixos/modules/services/misc | |
| parent | 5c8472a2a17625855d0811ebb5709c9aa84fdd3f (diff) | |
| parent | f0e38f7b3810b0f06bbe6908158fcb247d0e2dd3 (diff) | |
| download | nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.gz nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.bz2 nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.lz nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.xz nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.tar.zst nixpkgs-74c24385cb2864f937031df74af14fc8060e1540.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/jackett.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/services/misc/lidarr.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/misc/zoneminder.nix | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index a07f20e5c24..f2dc6635df9 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -34,6 +34,13 @@ in default = "jackett"; description = "Group under which Jackett runs."; }; + + package = mkOption { + type = types.package; + default = pkgs.jackett; + defaultText = "pkgs.jackett"; + description = "Jackett package to use."; + }; }; }; @@ -51,7 +58,7 @@ in Type = "simple"; User = cfg.user; Group = cfg.group; - ExecStart = "${pkgs.jackett}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; + ExecStart = "${cfg.package}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/misc/lidarr.nix b/nixos/modules/services/misc/lidarr.nix index 4c37bd74f15..40755c16217 100644 --- a/nixos/modules/services/misc/lidarr.nix +++ b/nixos/modules/services/misc/lidarr.nix @@ -68,6 +68,7 @@ in users.users = mkIf (cfg.user == "lidarr") { lidarr = { group = cfg.group; + home = "/var/lib/lidarr"; uid = config.ids.uids.lidarr; }; }; diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 8d58c2b37c8..cf56ae89b39 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -262,7 +262,7 @@ in { fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress}; } - location /cache { + location /cache/ { alias /var/cache/${dirName}; } |