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/web-apps/limesurvey.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/web-apps/limesurvey.nix')
| -rw-r--r-- | nixos/modules/services/web-apps/limesurvey.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index 99a33b8371c9..f23b3075574d 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -202,13 +202,13 @@ in }; services.phpfpm.pools.limesurvey = { - socketName = "limesurvey"; phpPackage = php; - user = "${user}"; - group = "${group}"; + listen = "/run/phpfpm/limesurvey.sock"; extraConfig = '' listen.owner = ${config.services.httpd.user}; listen.group = ${config.services.httpd.group}; + user = ${user}; + group = ${group}; env[LIMESURVEY_CONFIG] = ${limesurveyConfig} @@ -241,7 +241,7 @@ in <Directory "${pkg}/share/limesurvey"> <FilesMatch "\.php$"> <If "-f %{REQUEST_FILENAME}"> - SetHandler "proxy:unix:/run/phpfpm-limesurvey/limesurvey.sock|fcgi://localhost/" + SetHandler "proxy:unix:/run/phpfpm/limesurvey.sock|fcgi://localhost/" </If> </FilesMatch> |