ma deployment/owncloud: fix deprecated .extraConfig and .listen.
Mic92, lassulus ftw.
This commit is contained in:
parent
c17ea5df16
commit
500de5f879
|
@ -98,7 +98,7 @@ let
|
||||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||||
fastcgi_param HTTPS on;
|
fastcgi_param HTTPS on;
|
||||||
fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
|
fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
|
||||||
fastcgi_pass unix:${socket};
|
fastcgi_pass unix:${config.services.phpfpm.pools.${domain}.socket};
|
||||||
fastcgi_intercept_errors on;
|
fastcgi_intercept_errors on;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -126,7 +126,6 @@ let
|
||||||
services.phpfpm.pools."${domain}" = {
|
services.phpfpm.pools."${domain}" = {
|
||||||
user = "nginx";
|
user = "nginx";
|
||||||
group = "nginx";
|
group = "nginx";
|
||||||
listen = socket;
|
|
||||||
settings = {
|
settings = {
|
||||||
"listen.owner" = "nginx";
|
"listen.owner" = "nginx";
|
||||||
"pm" = "dynamic";
|
"pm" = "dynamic";
|
||||||
|
@ -135,13 +134,11 @@ let
|
||||||
"pm.start_servers" = 2;
|
"pm.start_servers" = 2;
|
||||||
"pm.min_spare_servers" = 2;
|
"pm.min_spare_servers" = 2;
|
||||||
"pm.max_spare_servers" = 5;
|
"pm.max_spare_servers" = 5;
|
||||||
|
"php_admin_value[error_log]" = "stderr";
|
||||||
|
"php_admin_flag[log_errors]" = "on";
|
||||||
|
"catch_workers_output" = true;
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
phpEnv."PATH" = lib.makeBinPath [ pkgs.php ];
|
||||||
php_admin_value[error_log] = 'stderr'
|
|
||||||
php_admin_flag[log_errors] = on
|
|
||||||
env[PATH] = ${lib.makeBinPath [ pkgs.php ]}
|
|
||||||
catch_workers_output = yes
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
services.phpfpm.phpOptions = ''
|
services.phpfpm.phpOptions = ''
|
||||||
opcache.enable=1
|
opcache.enable=1
|
||||||
|
|
Loading…
Reference in a new issue