0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00

Merge pull request #67888 from aanderse/deluge

nixos/deluge: fix directory creation errors
This commit is contained in:
Florian Klink 2019-09-01 19:03:20 +02:00 committed by GitHub
commit 8e7c47bf9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -173,7 +173,11 @@ in {
# Provide a default set of `extraPackages`. # Provide a default set of `extraPackages`.
services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ]; services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ];
systemd.tmpfiles.rules = [ "d '${configDir}' 0770 ${cfg.user} ${cfg.group}" ] systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group}"
"d '${cfg.dataDir}/.config' 0770 ${cfg.user} ${cfg.group}"
"d '${cfg.dataDir}/.config/deluge' 0770 ${cfg.user} ${cfg.group}"
]
++ optional (cfg.config ? "download_location") ++ optional (cfg.config ? "download_location")
"d '${cfg.config.download_location}' 0770 ${cfg.user} ${cfg.group}" "d '${cfg.config.download_location}' 0770 ${cfg.user} ${cfg.group}"
++ optional (cfg.config ? "torrentfiles_location") ++ optional (cfg.config ? "torrentfiles_location")
@ -237,7 +241,6 @@ in {
group = cfg.group; group = cfg.group;
uid = config.ids.uids.deluge; uid = config.ids.uids.deluge;
home = cfg.dataDir; home = cfg.dataDir;
createHome = true;
description = "Deluge Daemon user"; description = "Deluge Daemon user";
}; };
}; };