From 91263e74a39fcf882be520dbd1c67907bde39660 Mon Sep 17 00:00:00 2001 From: tbergervoet Date: Mon, 15 Oct 2018 13:03:05 +0200 Subject: [PATCH] Update 'RevProxyAdvanced.sh' --- RevProxyAdvanced.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/RevProxyAdvanced.sh b/RevProxyAdvanced.sh index 31dc2f9..bf967c4 100644 --- a/RevProxyAdvanced.sh +++ b/RevProxyAdvanced.sh @@ -159,13 +159,6 @@ server { location ~ /\.ht { deny all; } - - #listen 443 ssl; - #ssl_certificate /etc/letsencrypt/live/$domain/fullchain.pem; - #ssl_certificate_key /etc/letsencrypt/live/$domain/privkey.pem; - #include /etc/letsencrypt/options-ssl-nginx.conf; - #ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - } EOF fi @@ -285,7 +278,7 @@ if [ $netdata = 1 ]; then apt install -y netdata sed -i 's/SEND_EMAIL="YES"/SEND_EMAIL="NO"/g' /etc/netdata/health_alarm_notify.conf ufw allow 19999/tcp - sed -i 's+#netdata placeholder+upstream netdata {\n server 127.0.0.1:19999;\n keepalive 64;\n}+g' + sed -i 's+#netdata placeholder+upstream netdata {\n server 127.0.0.1:19999;\n keepalive 64;\n}+g' /etc/nginx/sites-available/"$domain" sed -i 's+#netdata here+location = /netdata {\n return 301 /netdata/;\n }\n\n location ~ /netdata/(?.*) {\n proxy_redirect off;\n proxy_set_header Host \$host;\n proxy_set_header X-Forwarded-Host \$host;\n proxy_set_header X-Forwarded-Server \$host;\n proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;\n proxy_http_version 1.1;\n proxy_pass_request_headers on;\n proxy_set_header Connection "keep-alive";\n proxy_store off;\n proxy_pass http://netdata/\$ndpath\$is_args\$args;\n }+g' /etc/nginx/sites-available/"$domain" # systemctl stop netdata # systemctl disable netdata @@ -320,7 +313,7 @@ fi ##---------------## if [ $wordpress = 1 ]; then - db_suffix=$(ls -l /var/www | grep -c ^d) + db_suffix=`expr $(ls -l /var/www | grep -c ^d) - 1` db_name="wp_$db_suffix" db_user="wp_$db_suffix" db_pass=$(date +%s|sha256sum|base64|head -c 32)