update upstream template

* cleanup stack.py
* replace nginx-ee by nginx-wo in install script
This commit is contained in:
VirtuBox
2019-03-10 23:46:52 +01:00
parent 759f265fc2
commit a0294576b7
3 changed files with 85 additions and 58 deletions

View File

@@ -1,50 +1,29 @@
# Common upstream settings
# PHP 5.6 upstream
#-------------------------------
# PHP 5.6
#-------------------------------
upstream php {
server 127.0.0.1:9000;
server 127.0.0.1:{{php}};
}
upstream debug {
# Debug Pool
server 127.0.0.1:9001;
}
# PHP 7.0 upstream
upstream php7 {
server 127.0.0.1:9070;
}
# PHP 7.2 upstream with load-balancing on two unix sockets
upstream php72 {
server unix:/var/run/php/php72-fpm.sock;
}
# PHP 7.2 debug
upstream debug72 {
# Debug Pool
server 127.0.0.1:9172;
}
# PHP 7.3 upstream with load-balancing on two unix sockets
upstream php73 {
server unix:/var/run/php/php73-fpm.sock;
server 127.0.0.1:{{debug}};
}
{{#php7conf}}
# PHP 7.3 debug
upstream debug73 {
#-------------------------------
# PHP 7.0
#-------------------------------
upstream php7 {
server 127.0.0.1:{{php7}};
}
upstream debug7 {
# Debug Pool
server 127.0.0.1:9173;
server 127.0.0.1:{{debug7}};
}
{{/php7conf}}
# Netdata Monitoring Upstream
upstream netdata {
server 127.0.0.1:19999;
keepalive 64;
}
{{#hhvmconf}}
upstream hhvm {
# HHVM Pool
@@ -52,3 +31,45 @@ server 127.0.0.1:{{hhvm}};
server 127.0.0.1:{{php}} backup;
}
{{/hhvmconf}}
#-------------------------------
# PHP 7.2
#-------------------------------
# PHP 7.2 upstream with load-balancing on two unix sockets
upstream php72 {
server unix:/var/run/php/php72-fpm.sock;
}
# 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 {
server unix:/var/run/php/php73-fpm.sock;
}
# 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;
}