diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-06-28 21:47:43 -0400 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2019-06-28 21:47:43 -0400 |
| commit | 278d867a9b50e2472b1724988363b26f8eea6bf7 (patch) | |
| tree | 42366eff05fcae152a48d7eaa39ed6d1762096ff /nixos/modules/services/misc/zoneminder.nix | |
| parent | 4b98e262a040f69197ad43cd4ec7f9106bf6495d (diff) | |
| download | nixlib-278d867a9b50e2472b1724988363b26f8eea6bf7.tar nixlib-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.gz nixlib-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.bz2 nixlib-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.lz nixlib-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.xz nixlib-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.zst nixlib-278d867a9b50e2472b1724988363b26f8eea6bf7.zip | |
Revert "Merge pull request #63156 from Izorkin/phpfpm-rootless"
This reverts commit b5478fd1a2ef442a54c36031bf3a27a96b5ea31c, reversing changes made to dbb00bfcbfb291e79d4d2d512041656e6bcfcd9a.
Diffstat (limited to 'nixos/modules/services/misc/zoneminder.nix')
| -rw-r--r-- | nixos/modules/services/misc/zoneminder.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index b0ee961c77f2..8d58c2b37c84 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-zoneminder/zoneminder.sock"; + socket = "/run/phpfpm/${dirName}.sock"; zms = "/cgi-bin/zms"; @@ -284,10 +284,7 @@ in { phpfpm = lib.mkIf useNginx { pools.zoneminder = { - socketName = "zoneminder"; - phpPackage = pkgs.php; - user = "${user}"; - group = "${group}"; + listen = socket; phpOptions = '' date.timezone = "${config.time.timeZone}" @@ -295,6 +292,9 @@ 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 |