public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/roundcube: fix work with phpfpm-rootless mode

Browse Source
This commit is contained in:
Izorkin 2019-06-15 15:22:36 +03:00
parent 320e8ab5d7
commit 59a33f25e5
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nixos/modules/services/mail/roundcube.nix
View File

@ -105,7 +105,7 @@ in
extraConfig = '' extraConfig = ''
location ~* \.php$ { location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/run/phpfpm/roundcube; fastcgi_pass unix:/run/phpfpm-roundcube/roundcube.sock;
include ${pkgs.nginx}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf; include ${pkgs.nginx}/conf/fastcgi.conf;
} }
@ -119,24 +119,28 @@ in
enable = true; enable = true;
}; };
services.phpfpm.poolConfigs.roundcube = '' services.phpfpm.pools.roundcube = {
listen = /run/phpfpm/roundcube socketName = "roundcube";
listen.owner = nginx phpPackage = pkgs.php;
listen.group = nginx user = "${config.services.nginx.user}";
listen.mode = 0660 group = "${config.services.nginx.group}";
user = nginx extraConfig = ''
pm = dynamic listen.owner = ${config.services.nginx.user}
pm.max_children = 75 listen.group = ${config.services.nginx.group}
pm.start_servers = 2 listen.mode = 0600
pm.min_spare_servers = 1 pm = dynamic
pm.max_spare_servers = 20 pm.max_children = 75
pm.max_requests = 500 pm.start_servers = 2
php_admin_value[error_log] = 'stderr' pm.min_spare_servers = 1
php_admin_flag[log_errors] = on pm.max_spare_servers = 20
php_admin_value[post_max_size] = 25M pm.max_requests = 500
php_admin_value[upload_max_filesize] = 25M php_admin_value[error_log] = 'stderr'
catch_workers_output = yes 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.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
systemd.services.roundcube-setup = let systemd.services.roundcube-setup = let