summary refs log tree commit diff
path: root/nixos/modules/services/web-apps/tt-rss.nix
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-06-28 21:47:43 -0400
committerAaron Andersen <aaron@fosslib.net>2019-06-28 21:47:43 -0400
commit278d867a9b50e2472b1724988363b26f8eea6bf7 (patch)
tree42366eff05fcae152a48d7eaa39ed6d1762096ff /nixos/modules/services/web-apps/tt-rss.nix
parent4b98e262a040f69197ad43cd4ec7f9106bf6495d (diff)
downloadnixpkgs-278d867a9b50e2472b1724988363b26f8eea6bf7.tar
nixpkgs-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.gz
nixpkgs-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.bz2
nixpkgs-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.lz
nixpkgs-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.xz
nixpkgs-278d867a9b50e2472b1724988363b26f8eea6bf7.tar.zst
nixpkgs-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/tt-rss.nix')
-rw-r--r--nixos/modules/services/web-apps/tt-rss.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index e59988ef7b2..b882f6c2ae7 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -512,14 +512,12 @@ let
 
     services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
       "${poolName}" = {
-        socketName = "${poolName}";
-        phpPackage = pkgs.php;
-        user = "${config.services.nginx.user}";
-        group = "${config.services.nginx.group}";
+        listen = "/var/run/phpfpm/${poolName}.sock";
         extraConfig = ''
-          listen.owner = ${config.services.nginx.user}
-          listen.group = ${config.services.nginx.group}
+          listen.owner = nginx
+          listen.group = nginx
           listen.mode = 0600
+          user = ${cfg.user}
           pm = dynamic
           pm.max_children = 75
           pm.start_servers = 10
@@ -545,7 +543,7 @@ let
           locations."~ \.php$" = {
             extraConfig = ''
               fastcgi_split_path_info ^(.+\.php)(/.+)$;
-              fastcgi_pass unix:/run/phpfpm-${poolName}/${poolName}.sock;
+              fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.listen};
               fastcgi_index index.php;
             '';
           };