summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-24 07:57:19 -0500
committerAaron Andersen <aaron@fosslib.net>2019-05-26 07:20:54 -0400
commit0b7305e7830683300fdc9bd3e83000bc9fa2a27b (patch)
tree2410a0c1fd4f404eaa4b018f6a366d9065a0cec6
parent4a4d3a2e047ab744eb35c4440e42fa42ce6a3303 (diff)
downloadnixpkgs-0b7305e7830683300fdc9bd3e83000bc9fa2a27b.tar
nixpkgs-0b7305e7830683300fdc9bd3e83000bc9fa2a27b.tar.gz
nixpkgs-0b7305e7830683300fdc9bd3e83000bc9fa2a27b.tar.bz2
nixpkgs-0b7305e7830683300fdc9bd3e83000bc9fa2a27b.tar.lz
nixpkgs-0b7305e7830683300fdc9bd3e83000bc9fa2a27b.tar.xz
nixpkgs-0b7305e7830683300fdc9bd3e83000bc9fa2a27b.tar.zst
nixpkgs-0b7305e7830683300fdc9bd3e83000bc9fa2a27b.zip
nixos/unifi: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
-rw-r--r--nixos/modules/services/networking/unifi.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index c82e0af2803..9057a1e12b3 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -146,6 +146,11 @@ in
         where = where;
       }) mountPoints;
 
+    systemd.tmpfiles.rules = [
+      "e '${stateDir}' 0700 unifi - - -"
+      "e '${stateDir}/data' 0700 unifi - - -"
+    ];
+
     systemd.services.unifi = {
       description = "UniFi controller daemon";
       wantedBy = [ "multi-user.target" ];
@@ -157,14 +162,9 @@ in
       environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib";
 
       preStart = ''
-        # Ensure privacy of state and data.
-        chown unifi "${stateDir}" "${stateDir}/data"
-        chmod 0700 "${stateDir}" "${stateDir}/data"
-
         # Create the volatile webapps
         rm -rf "${stateDir}/webapps"
         mkdir -p "${stateDir}/webapps"
-        chown unifi "${stateDir}/webapps"
         ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT"
       '';
 
@@ -177,7 +177,6 @@ in
         ExecStart = "${(removeSuffix "\n" cmd)} start";
         ExecStop = "${(removeSuffix "\n" cmd)} stop";
         User = "unifi";
-        PermissionsStartOnly = true;
         UMask = "0077";
         WorkingDirectory = "${stateDir}";
       };