Additional Nginx tweaks

2019-08-16 22:57:26 +02:00
parent 5b654b64b3
commit aa1a830c5b
5 changed files with 589 additions and 562 deletions
--- a/wo/cli/templates/upstream.mustache
+++ b/wo/cli/templates/upstream.mustache
@@ -1,86 +1,86 @@
-# NGINX UPSTREAM CONFIGURATION - WO v3.9.7
-# DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE
-#-------------------------------
-# PHP 5.6
-#-------------------------------
-upstream php {
-server 127.0.0.1:{{php}};
-}
-
-upstream debug {
-server 127.0.0.1:{{debug}};
-}
-
-
-#-------------------------------
-# PHP 7.0
-#-------------------------------
-
-upstream php7 {
-server 127.0.0.1:{{php7}};
-}
-upstream debug7 {
-# Debug Pool
-server 127.0.0.1:{{debug7}};
-}
-
-
-#-------------------------------
-# PHP 7.2
-#-------------------------------
-
-# PHP 7.2 upstream with load-balancing on two unix sockets
-upstream php72 {
-    least_conn;
-
-    server unix:/var/run/php/php72-fpm.sock;
-    server unix:/var/run/php/php72-two-fpm.sock;
-
-    keepalive 5;
-}
-
-# PHP 7.2 debug
-upstream debug72 {
-# Debug Pool
-server 127.0.0.1:9172;
-}
-
-#-------------------------------
-# PHP 7.3
-#-------------------------------
-
-# PHP 7.3 upstream with load-balancing on two unix sockets
-upstream php73 {
-    least_conn;
-
-    server unix:/var/run/php/php73-fpm.sock;
-    server unix:/var/run/php/php73-two-fpm.sock;
-
-    keepalive 5;
-}
-
-# PHP 7.3 debug
-upstream debug73 {
-# Debug Pool
-    server 127.0.0.1:9173;
-}
-
-#-------------------------------
-# Netdata
-#-------------------------------
-
-# Netdata Monitoring Upstream
-upstream netdata {
-    server 127.0.0.1:19999;
-    keepalive 64;
-}
-
-#-------------------------------
-# Redis
-#-------------------------------
-
-# Redis cache upstream
-upstream redis {
-    server 127.0.0.1:6379;
-    keepalive 10;
-}
+# NGINX UPSTREAM CONFIGURATION - WO v3.9.8
+# DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE
+#-------------------------------
+# PHP 5.6
+#-------------------------------
+upstream php {
+server 127.0.0.1:{{php}};
+}
+
+upstream debug {
+server 127.0.0.1:{{debug}};
+}
+
+
+#-------------------------------
+# PHP 7.0
+#-------------------------------
+
+upstream php7 {
+server 127.0.0.1:{{php7}};
+}
+upstream debug7 {
+# Debug Pool
+server 127.0.0.1:{{debug7}};
+}
+
+
+#-------------------------------
+# PHP 7.2
+#-------------------------------
+
+# PHP 7.2 upstream with load-balancing on two unix sockets
+upstream php72 {
+    least_conn;
+
+    server unix:/var/run/php/php72-fpm.sock;
+    server unix:/var/run/php/php72-two-fpm.sock;
+
+    keepalive 5;
+}
+
+# PHP 7.2 debug
+upstream debug72 {
+# Debug Pool
+server 127.0.0.1:9172;
+}
+
+#-------------------------------
+# PHP 7.3
+#-------------------------------
+
+# PHP 7.3 upstream with load-balancing on two unix sockets
+upstream php73 {
+    least_conn;
+
+    server unix:/var/run/php/php73-fpm.sock;
+    server unix:/var/run/php/php73-two-fpm.sock;
+
+    keepalive 5;
+}
+
+# PHP 7.3 debug
+upstream debug73 {
+# Debug Pool
+    server 127.0.0.1:9173;
+}
+
+#-------------------------------
+# Netdata
+#-------------------------------
+
+# Netdata Monitoring Upstream
+upstream netdata {
+    server 127.0.0.1:19999;
+    keepalive 64;
+}
+
+#-------------------------------
+# Redis
+#-------------------------------
+
+# Redis cache upstream
+upstream redis {
+    server 127.0.0.1:6379;
+    keepalive 10;
+}