summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/nginx
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-10-16 11:39:55 +0200
committerlassulus <lassulus@lassul.us>2019-10-16 11:39:55 +0200
commit1cfe17faa0b5b2d062da0b3cdbda34b1241dac02 (patch)
tree2ae25beec60641929e65d22b05a241eff656b8c0 /makefu/2configs/nginx
parent005d456ef42ca1a371131a558e834944ce2e616f (diff)
parent349ccf95e76dec7d3eb87b96cc8bb8bcb3317dc0 (diff)
Merge remote-tracking branch 'gum/19.09'
Diffstat (limited to 'makefu/2configs/nginx')
-rw-r--r--makefu/2configs/nginx/euer.mon.nix2
-rw-r--r--makefu/2configs/nginx/euer.wiki.nix35
2 files changed, 17 insertions, 20 deletions
diff --git a/makefu/2configs/nginx/euer.mon.nix b/makefu/2configs/nginx/euer.mon.nix
index 765fef535..c9db15b73 100644
--- a/makefu/2configs/nginx/euer.mon.nix
+++ b/makefu/2configs/nginx/euer.mon.nix
@@ -32,7 +32,7 @@ in {
auth_basic "Needs Autherization to visit";
auth_basic_user_file ${authFile};
proxy_http_version 1.1;
- proxy_set_header Host $http_host;
+ proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_redirect off;
'';
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 732c27784..a6766eeec 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -23,25 +23,22 @@ let
in {
state = [ base-dir ];
services.phpfpm = {
- # phpfpm does not have an enable option
- poolConfigs = {
- euer-wiki = ''
- user = ${user}
- group = ${group}
- listen = ${fpm-socket}
- listen.owner = ${user}
- listen.group = ${group}
- env[twconf] = ${base-cfg};
- pm = dynamic
- pm.max_children = 5
- pm.start_servers = 2
- pm.min_spare_servers = 1
- pm.max_spare_servers = 3
- chdir = /
- php_admin_value[error_log] = 'stderr'
- php_admin_flag[log_errors] = on
- catch_workers_output = yes
- '';
+ pools.euer-wiki = {
+ inherit user group;
+ listen = fpm-socket;
+ settings = {
+ "pm" = "dynamic";
+ "pm.max_children" = 5;
+ "pm.start_servers" = 2;
+ "pm.min_spare_servers" = 1;
+ "pm.max_spare_servers" = 3;
+ "chdir" = "/";
+ "php_admin_value[error_log]" = "stderr";
+ "php_admin_flag[log_errors]" = "on";
+ "catch_workers_output" = "yes";
+
+ };
+ phpEnv.twconf = base-cfg;
};
};