summary refs log tree commit diff
path: root/nixos/modules/services/networking/aria2.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-07-03 08:59:42 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-07-03 08:59:42 +0200
commit25a77b72106922b055d1e1f1883c164d34b17311 (patch)
treec7c981528854fc55a9aed6a2445f4e8172ea9ea0 /nixos/modules/services/networking/aria2.nix
parentd41bc0ff569f199517becf0ca4da87f8e29b1254 (diff)
parent3ad01beda76c038e52e8f4524d5f3c409e0b6e36 (diff)
downloadnixpkgs-25a77b72106922b055d1e1f1883c164d34b17311.tar
nixpkgs-25a77b72106922b055d1e1f1883c164d34b17311.tar.gz
nixpkgs-25a77b72106922b055d1e1f1883c164d34b17311.tar.bz2
nixpkgs-25a77b72106922b055d1e1f1883c164d34b17311.tar.lz
nixpkgs-25a77b72106922b055d1e1f1883c164d34b17311.tar.xz
nixpkgs-25a77b72106922b055d1e1f1883c164d34b17311.tar.zst
nixpkgs-25a77b72106922b055d1e1f1883c164d34b17311.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/networking/aria2.nix')
-rw-r--r--nixos/modules/services/networking/aria2.nix14
1 files changed, 5 insertions, 9 deletions
diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix
index 98eb0086101..53829bf1886 100644
--- a/nixos/modules/services/networking/aria2.nix
+++ b/nixos/modules/services/networking/aria2.nix
@@ -102,22 +102,19 @@ in
 
     users.groups.aria2.gid = config.ids.gids.aria2;
 
+    systemd.tmpfiles.rules = [
+      "d '${homeDir}' 0770 aria2 aria2 - -"
+      "d '${config.services.aria2.downloadDir}' 0770 aria2 aria2 - -"
+    ];
+
     systemd.services.aria2 = {
       description = "aria2 Service";
       after = [ "local-fs.target" "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
-        mkdir -m 0770 -p "${homeDir}"
-        chown aria2:aria2 "${homeDir}"
-        if [[ ! -d "${config.services.aria2.downloadDir}" ]]
-        then
-          mkdir -m 0770 -p "${config.services.aria2.downloadDir}"
-          chown aria2:aria2 "${config.services.aria2.downloadDir}"
-        fi
         if [[ ! -e "${sessionFile}" ]]
         then
           touch "${sessionFile}"
-          chown aria2:aria2 "${sessionFile}"
         fi
         cp -f "${settingsFile}" "${settingsDir}/aria2.conf"
       '';
@@ -128,7 +125,6 @@ in
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         User = "aria2";
         Group = "aria2";
-        PermissionsStartOnly = true;
       };
     };
   };