about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-09-01 19:03:20 +0200
committerGitHub <noreply@github.com>2019-09-01 19:03:20 +0200
commit8e7c47bf9e15a7301fff7a48da98c3be25f8d477 (patch)
treea96318110891c3c96a02c7341f018d0bb5b2f2ff /nixos
parent15f3e4eb814e7701492762326ebcfc8b21543a4d (diff)
parentc6b3ed4bfcf28622d450df66bcc5f9d019489b3f (diff)
downloadnixlib-8e7c47bf9e15a7301fff7a48da98c3be25f8d477.tar
nixlib-8e7c47bf9e15a7301fff7a48da98c3be25f8d477.tar.gz
nixlib-8e7c47bf9e15a7301fff7a48da98c3be25f8d477.tar.bz2
nixlib-8e7c47bf9e15a7301fff7a48da98c3be25f8d477.tar.lz
nixlib-8e7c47bf9e15a7301fff7a48da98c3be25f8d477.tar.xz
nixlib-8e7c47bf9e15a7301fff7a48da98c3be25f8d477.tar.zst
nixlib-8e7c47bf9e15a7301fff7a48da98c3be25f8d477.zip
Merge pull request #67888 from aanderse/deluge
nixos/deluge: fix directory creation errors
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/torrent/deluge.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 48ec4d692e2f..d8810a4481b1 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -173,7 +173,11 @@ in {
     # Provide a default set of `extraPackages`.
     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")
       "d '${cfg.config.download_location}' 0770 ${cfg.user} ${cfg.group}"
     ++ optional (cfg.config ? "torrentfiles_location")
@@ -237,7 +241,6 @@ in {
         group = cfg.group;
         uid = config.ids.uids.deluge;
         home = cfg.dataDir;
-        createHome = true;
         description = "Deluge Daemon user";
       };
     };