about summary refs log tree commit diff
path: root/nixos/modules/services/misc/zoneminder.nix
diff options
context:
space:
mode:
authorElis Hirwing <elis@hirwing.se>2019-06-27 19:13:53 +0200
committerGitHub <noreply@github.com>2019-06-27 19:13:53 +0200
commitb5478fd1a2ef442a54c36031bf3a27a96b5ea31c (patch)
treea898427ac474957a680888252c810e4bdfe37ecc /nixos/modules/services/misc/zoneminder.nix
parentdbb00bfcbfb291e79d4d2d512041656e6bcfcd9a (diff)
parenteee87b460ea9a5a9e122dcc313fa20b9962872a5 (diff)
downloadnixlib-b5478fd1a2ef442a54c36031bf3a27a96b5ea31c.tar
nixlib-b5478fd1a2ef442a54c36031bf3a27a96b5ea31c.tar.gz
nixlib-b5478fd1a2ef442a54c36031bf3a27a96b5ea31c.tar.bz2
nixlib-b5478fd1a2ef442a54c36031bf3a27a96b5ea31c.tar.lz
nixlib-b5478fd1a2ef442a54c36031bf3a27a96b5ea31c.tar.xz
nixlib-b5478fd1a2ef442a54c36031bf3a27a96b5ea31c.tar.zst
nixlib-b5478fd1a2ef442a54c36031bf3a27a96b5ea31c.zip
Merge pull request #63156 from Izorkin/phpfpm-rootless
phpfpm: do not run anything as root
Diffstat (limited to 'nixos/modules/services/misc/zoneminder.nix')
-rw-r--r--nixos/modules/services/misc/zoneminder.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 8d58c2b37c84..b0ee961c77f2 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -19,7 +19,7 @@ let
 
   useCustomDir = cfg.storageDir != null;
 
-  socket = "/run/phpfpm/${dirName}.sock";
+  socket = "/run/phpfpm-zoneminder/zoneminder.sock";
 
   zms = "/cgi-bin/zms";
 
@@ -284,7 +284,10 @@ in {
 
       phpfpm = lib.mkIf useNginx {
         pools.zoneminder = {
-          listen = socket;
+          socketName = "zoneminder";
+          phpPackage = pkgs.php;
+          user = "${user}";
+          group = "${group}";
           phpOptions = ''
             date.timezone = "${config.time.timeZone}"
 
@@ -292,9 +295,6 @@ in {
             "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)}
           '';
           extraConfig = ''
-            user = ${user}
-            group = ${group}
-
             listen.owner = ${user}
             listen.group = ${group}
             listen.mode = 0660