Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma deployment/owncloud: fix deprecated .extraConfig and .listen.

Browse Source 
Mic92, lassulus ftw.
This commit is contained in:
exco 2020-10-23 20:56:32 +02:00 committed by makefu
parent 9ad7c3114b
commit fd41a76d4c
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makefu/2configs/deployment/owncloud.nix
View File

@ -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