From 88fc83b8370e6e95ac7a90410a88d7bb10fca50e Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 16 Jul 2023 21:48:48 -0500
Subject: [PATCH] update

---
 defaults.inc        |  4 +++-
 nodemgmt-scripts.sh | 17 +++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index ef8fe68c..ce2bd6da 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -35,6 +35,7 @@ if [ -f ${NM_FOLDER}/defaults.local.inc ]; then
 	declare -A NM_SINGLESRVR_DOCKERS
 	declare -A NM_SINGLESRVR_IP
 	declare -A NM_CERTPATHS
+	declare -A NM_WWWPATHS
 	
 	source ${NM_FOLDER}/defaults.local.inc
 
@@ -131,6 +132,7 @@ done
 
 [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_NGINXPATH=${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]} || NM_NGINXPATH=/etc/nginx
 [ "${NM_CERTPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_CERTPATH=${NM_CERTPATHS[${RUN_NODE_TYPE}]} || NM_CERTPATH=/etc/letsencrypt
+[ "${NM_WWWPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_WWWPATH=${NM_WWWPATHS[${RUN_NODE_TYPE}]} || NM_WWWPATH=/var/www
 
 declare -A NM_SRVCOPTS
 NM_SRVCOPTS['status']='Status'
@@ -145,7 +147,7 @@ NM_SRVCOPTS['daemon-reload']='Daemon-Reload'
 declare -A NM_BACKUP_ITEMS
 NM_BACKUP_ITEMS['nginx-settings']=${NM_NGINXPATH}
 NM_BACKUP_ITEMS['nginx-logs']=/var/log/nginx
-NM_BACKUP_ITEMS['letsencrypt-certs']=/etc/letsencrypt
+NM_BACKUP_ITEMS['letsencrypt-certs']=${NM_CERTPATH}
 NM_BACKUP_ITEMS['webserver-files']=/var/www
 NM_BACKUP_ITEMS['haproxy']=/etc/haproxy
 NM_BACKUP_ITEMS['keepalived']=/etc/keepalived
diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 6ee28d7e..3c0bd9a9 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -147,6 +147,7 @@ SET-PERMISSIONS(){
 			done
 		fi
 		nid=1
+		[ "${NM_WWWPATHS['WEB']}" != "" ] && WWWPATH=${NM_WWWPATHS['WEB']} || WWWPATH=/var/www
 		for nip in "${WEB_HOSTS[@]}"; do
 			checkhost=$(CHECK_HOST ${nip})
 			if [ "${checkhost}" != "false" ]; then
@@ -158,16 +159,16 @@ SET-PERMISSIONS(){
 				fi
 				if [ "${NEW_SITE}" != "" ]; then
 					echo -en "${idsCL[Cyan]}Webserver-Node${nid} (${nip})    ${idsCL[Default]}"
-					${NCMD} chown -R www-data:www-data /var/www/$NEW_SITE
-					${NCMD} chmod -R 7775 /var/www/$NEW_SITE
+					${NCMD} chown -R www-data:www-data ${WWWPATH}/$NEW_SITE
+					${NCMD} chmod -R 7775 ${WWWPATH}/$NEW_SITE
 					${NCMD} chown -R www-data:www-data /var/lib/php/sessions
 					${NCMD} chmod -R 7777 /var/lib/php/sessions
 					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
 				else
 					echo -e "${idsCL[Yellow]}Setting folder permissions for Webserver-Node${nid} (${nip})${idsCL[Default]}"
 					echo -en "${idsCL[Cyan]}Webserver folders    ${idsCL[Default]}"
-					${NCMD} chown -R www-data:www-data /var/www
-					${NCMD} chmod -R 7775 /var/www
+					${NCMD} chown -R www-data:www-data ${WWWPATH}
+					${NCMD} chmod -R 7775 ${WWWPATH}
 					${NCMD} chown -R www-data:www-data /var/lib/php/sessions
 					${NCMD} chmod -R 7777 /var/lib/php/sessions
 					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
@@ -177,14 +178,6 @@ SET-PERMISSIONS(){
 					${NCMD} chown -R git:git /home/git
 					${NCMD} chmod -R 750 /home/git
 					echo -e "${idsCL[Green]}Complete${idsCL[Def ault]}"
-					echo -en "${idsCL[Cyan]}LetsEncrypt Certs    ${idsCL[Default]}"
-					${NCMD} chown -R root:le ${NM_CERTPATH}
-					${NCMD} chmod -R 6775 ${NM_CERTPATH}
-					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
-					echo -en "${idsCL[Cyan]}PowerDNS-Admin       ${idsCL[Default]}"
-					${NCMD} chown -R www-data:www-data /opt/powerdns-admin
-					${NCMD} chmod -R 775 /opt/powerdns-admin
-					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
 					echo 
 				fi
 			fi