summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-24 07:39:53 -0500
committerAaron Andersen <aaron@fosslib.net>2019-05-26 07:20:54 -0400
commit4a4d3a2e047ab744eb35c4440e42fa42ce6a3303 (patch)
tree260aee0676e05d787678f9c06c9cf98f59867ea6
parentc7481e6340a4eb771d2cc0a057ef4676a377486e (diff)
downloadnixpkgs-4a4d3a2e047ab744eb35c4440e42fa42ce6a3303.tar
nixpkgs-4a4d3a2e047ab744eb35c4440e42fa42ce6a3303.tar.gz
nixpkgs-4a4d3a2e047ab744eb35c4440e42fa42ce6a3303.tar.bz2
nixpkgs-4a4d3a2e047ab744eb35c4440e42fa42ce6a3303.tar.lz
nixpkgs-4a4d3a2e047ab744eb35c4440e42fa42ce6a3303.tar.xz
nixpkgs-4a4d3a2e047ab744eb35c4440e42fa42ce6a3303.tar.zst
nixpkgs-4a4d3a2e047ab744eb35c4440e42fa42ce6a3303.zip
nixos/zeronet: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
-rw-r--r--nixos/modules/services/networking/zeronet.nix13
1 files changed, 5 insertions, 8 deletions
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index 611a51c74ce..f4988a90268 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -86,20 +86,17 @@ in with lib; {
       '';
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' 750 zeronet zeronet - -"
+      "d '${cfg.logDir}' 750 zeronet zeronet - -"
+    ];
+
     systemd.services.zeronet = {
       description = "zeronet";
       after = [ "network.target" (optionalString cfg.tor "tor.service") ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        # Ensure folder exists or create it and permissions are correct
-        mkdir -p ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}
-        chmod 750 ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}
-        chown zeronet:zeronet ${escapeShellArg cfg.dataDir} ${escapeShellArg cfg.logDir}
-      '';
-
       serviceConfig = {
-        PermissionsStartOnly = true;
         PrivateTmp = "yes";
         User = "zeronet";
         Group = "zeronet";