summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorIzorkin <izorkin@elven.pw>2019-06-15 16:38:07 +0300
committerIzorkin <izorkin@elven.pw>2019-06-16 12:33:51 +0300
commit5d3805487a8b6172ce04604f2dc39902e4fcb286 (patch)
tree58e5e3164e57650da9b46b3e7d617f3ca71e6b44 /nixos
parent2172419101c08b68652c37b38eb03b453fb252fa (diff)
downloadnixpkgs-5d3805487a8b6172ce04604f2dc39902e4fcb286.tar
nixpkgs-5d3805487a8b6172ce04604f2dc39902e4fcb286.tar.gz
nixpkgs-5d3805487a8b6172ce04604f2dc39902e4fcb286.tar.bz2
nixpkgs-5d3805487a8b6172ce04604f2dc39902e4fcb286.tar.lz
nixpkgs-5d3805487a8b6172ce04604f2dc39902e4fcb286.tar.xz
nixpkgs-5d3805487a8b6172ce04604f2dc39902e4fcb286.tar.zst
nixpkgs-5d3805487a8b6172ce04604f2dc39902e4fcb286.zip
nixos/zoneminder: fix work with phpfpm-rootless mode
Diffstat (limited to 'nixos')
-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 9c555e8031c..82d49cdedec 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";
 
@@ -278,7 +278,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}"
 
@@ -286,9 +289,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