diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index f1cb0982..9cc0eb97 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1480,9 +1480,9 @@ NEWSITE(){ ######################################### PROXY else - [ "${WEBSOCKET}" == "yes" ] && WEBSOCKET="include conf.d\/include\/websocket-support.conf;" || WEBSOCKET="" + [ "${WEBSOCKET}" == "yes" ] && WEBSOCKET="include conf.d/include/websocket-support.conf;" || WEBSOCKET="" [ "${HSTS}" == "yes" ] && HSTS="include conf.d\/include\/hsts-support.conf;" || HSTS="" - [ "${EXPLOITS}" == "yes" ] && EXPLOITS="include conf.d\/include\/block-exploits.conf;" || EXPLOITS="" + [ "${EXPLOITS}" == "yes" ] && EXPLOITS="include conf.d/include/block-exploits.conf;" || EXPLOITS="" cp ${FOLDER}/templates/nginx.proxy.site /etc/nginx/sites-enabled/${MAIN_SITE}.conf sed -i "s/<>/${MAIN_SITE}/g" /etc/nginx/sites-enabled/${MAIN_SITE}.conf @@ -1494,11 +1494,11 @@ NEWSITE(){ sed -i "s/<>/${EXPLOITS}/g" /etc/nginx/sites-enabled/${MAIN_SITE}.conf fi - - - if [ "${CREATE_SSL}" = "yes" ]; then NEWCERT ${NEW_SITE} + if [ "${SITE_TYPE}" == "proxy" ]; then + sed -i "s/#ssl_certificate/ssl_certificate/g" /etc/nginx/sites-enabled/${MAIN_SITE}.conf + fi fi rm -f ${FOLDER}/new-site.lastrun diff --git a/templates/nginx.proxy.site b/templates/nginx.proxy.site index 13fa435e..1094969f 100644 --- a/templates/nginx.proxy.site +++ b/templates/nginx.proxy.site @@ -10,8 +10,8 @@ server { include conf.d/include/letsencrypt-acme-challenge.conf; include conf.d/include/ssl-ciphers.conf; - ssl_certificate /opt/lb-data/letsencrypt/live/<>/fullchain.pem; - ssl_certificate_key /opt/lb-data/letsencrypt/live/<>/privkey.pem; + #ssl_certificate /opt/lb-data/letsencrypt/live/<>/fullchain.pem; + #ssl_certificate_key /opt/lb-data/letsencrypt/live/<>/privkey.pem; access_log /var/log/nginx/<>.proxy.log proxy; error_log /var/log/nginx/<>.error.log warn;