about summary refs log tree commit diff
path: root/nixos/modules/services/web-apps/limesurvey.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/web-apps/limesurvey.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/web-apps/limesurvey.nix')
-rw-r--r--nixos/modules/services/web-apps/limesurvey.nix8
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 f23b3075574d..99a33b8371c9 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;
-      listen = "/run/phpfpm/limesurvey.sock";
+      user = "${user}";
+      group = "${group}";
       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.sock|fcgi://localhost/"
+                  SetHandler "proxy:unix:/run/phpfpm-limesurvey/limesurvey.sock|fcgi://localhost/"
                 </If>
               </FilesMatch>