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/mail | |
| parent | 4b98e262a040f69197ad43cd4ec7f9106bf6495d (diff) | |
| download | nixpkgs-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/mail')
| -rw-r--r-- | nixos/modules/services/mail/roundcube.nix | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 12837f7efe7..e8b2e11bf72 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -105,7 +105,7 @@ in extraConfig = '' location ~* \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/phpfpm-roundcube/roundcube.sock; + fastcgi_pass unix:/run/phpfpm/roundcube; include ${pkgs.nginx}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } @@ -119,28 +119,24 @@ in enable = true; }; - services.phpfpm.pools.roundcube = { - socketName = "roundcube"; - phpPackage = pkgs.php; - user = "${config.services.nginx.user}"; - group = "${config.services.nginx.group}"; - extraConfig = '' - listen.owner = ${config.services.nginx.user} - listen.group = ${config.services.nginx.group} - listen.mode = 0600 - pm = dynamic - pm.max_children = 75 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 20 - pm.max_requests = 500 - php_admin_value[error_log] = 'stderr' - php_admin_flag[log_errors] = on - php_admin_value[post_max_size] = 25M - php_admin_value[upload_max_filesize] = 25M - catch_workers_output = yes - ''; - }; + services.phpfpm.poolConfigs.roundcube = '' + listen = /run/phpfpm/roundcube + listen.owner = nginx + listen.group = nginx + listen.mode = 0660 + user = nginx + pm = dynamic + pm.max_children = 75 + pm.start_servers = 2 + pm.min_spare_servers = 1 + pm.max_spare_servers = 20 + pm.max_requests = 500 + php_admin_value[error_log] = 'stderr' + php_admin_flag[log_errors] = on + php_admin_value[post_max_size] = 25M + php_admin_value[upload_max_filesize] = 25M + catch_workers_output = yes + ''; systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ]; systemd.services.roundcube-setup = let |