voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-13 14:39:16 -06:00
parent 7432d05edd
commit 3d95158149
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.20-12122023' VERS='5.1.21-12132023'
NM_BETA=false NM_BETA=false
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck '

4
inc/certs.inc
View File

@@ -63,7 +63,9 @@ NEWCERT(){
echo -e "$(date +%Y-%m-%d-%H-%M-%S) - ${NEW_CERT}" >> ${NM_LOGFOLDER}/cert.requests echo -e "$(date +%Y-%m-%d-%H-%M-%S) - ${NEW_CERT}" >> ${NM_LOGFOLDER}/cert.requests
if [ -f ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf ]; then if [ -f ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf ]; then
sed -i "s/#ssl_certificate/ssl_certificate/g" ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf sed -i "s/#ssl_certificate/ssl_certificate/g" ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf
sed -i "s/#listen 443/listen 443/g" ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf
sed -i "s/#include conf.d\/include\/ssl-ciphers.conf/include conf.d\/include\/ssl-ciphers.conf/g" ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf
sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf
DIVIDER true DIVIDER true
if [ "${NEWSITE}" != "true" ]; then if [ "${NEWSITE}" != "true" ]; then
echo -e -n "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}" echo -e -n "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}"

14
inc/sites.inc
View File

@@ -445,17 +445,19 @@ NEWPROXYSITE_CREATE(){
if [ "${SSL^^}" == "YES" ]; then if [ "${SSL^^}" == "YES" ]; then
echo -en "${idsCL[LightCyan]}Enabling SSL ... " echo -en "${idsCL[LightCyan]}Enabling SSL ... "
sed -i "s/#ssl_certificate/ssl_certificate/g" ${nginxconfig}
sed -i "s/#listen 443/listen 443/g" ${nginxconfig}
sed -i "s/#include conf.d\/include\/ssl-ciphers.conf/include conf.d\/include\/ssl-ciphers.conf/g" ${nginxconfig}
sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${nginxconfig}
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
echo
if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then
echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... " echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... "
SERVICE_MGMT nginx restart
NEWCERT ${CERTTEST}-newsite ${NGINX_SERVERNAME} NEWCERT ${CERTTEST}-newsite ${NGINX_SERVERNAME}
echo echo
else
sed -i "s/#ssl_certificate/ssl_certificate/g" ${nginxconfig}
sed -i "s/#listen 443/listen 443/g" ${nginxconfig}
sed -i "s/#include conf.d\/include\/ssl-ciphers.conf/include conf.d\/include\/ssl-ciphers.conf/g" ${nginxconfig}
sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${nginxconfig}
echo
fi fi
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
else else
echo -en "${idsCL[LightCyan]}Disabling SSL ... " echo -en "${idsCL[LightCyan]}Disabling SSL ... "
sed -i "s/ssl_certificate/#ssl_certificate/g" ${nginxconfig} sed -i "s/ssl_certificate/#ssl_certificate/g" ${nginxconfig}