multisite - bug fixes

2020-11-11 16:54:27 +01:00
parent bd7997497b
commit 2da51d92a6
14 changed files with 60 additions and 33 deletions
--- a/confs/site/modsecurity.conf
+++ b/confs/site/modsecurity.conf
@@ -1,2 +1,2 @@
 modsecurity on;
-modsecurity_rules_file /etc/nginx/modsecurity-rules.conf;
+modsecurity_rules_file %MODSEC_RULES_FILE%;
--- a/confs/site/php.conf
+++ b/confs/site/php.conf
@@ -1,5 +1,5 @@
 location ~ \.php$ {
 	fastcgi_pass      %REMOTE_PHP%:9000;
 	fastcgi_index     index.php;
-	include           fastcgi.conf;
+	include           /etc/nginx/fastcgi.conf;
 }
--- a/confs/site/server.conf
+++ b/confs/site/server.conf
@@ -1,6 +1,6 @@
 server {
-	include /server-confs/*.conf;
-	include /etc/nginx/main-lua.conf;
+	%SERVER_CONF%
+	%MAIN_LUA%
 	%PROXY_REAL_IP%
 	%USE_MODSECURITY%
 	%LISTEN_HTTP%