From 906f45f247def024765eccbcd8057147d337fa48 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 26 Feb 2019 22:51:55 -0600 Subject: [PATCH] update --- defaults.inc | 2 ++ nodemgmt-scripts.sh | 37 ++++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/defaults.inc b/defaults.inc index 4d5056a3..b62be356 100755 --- a/defaults.inc +++ b/defaults.inc @@ -17,8 +17,10 @@ declare -i errtime IFS=, NODE_HOSTS=(${NODEHOSTS}) +WEB_HOSTS=(${WEBHOSTS}) NODE_SERVICES=(${NODESERVICES}) NODE_SERVICES_CHECK=(${NODESERVICES_CHECK}) +WEB_SERVICES_CHECK=(${WEBSERVICES_CHECK}) LOCAL_SERVICES=(${LOCAL_SERVICES}) unset IFS diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 66439505..474b5e17 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1133,8 +1133,31 @@ SET-PERMISSIONS(){ NEW_SITE=${1} echo -e "${idsCL[Yellow]}Setting new site folder permissions for (/var/www/${NEW_SITE})${idsCL[Default]}" fi + if [ "${NEW_SITE}" = "" ]; then + nid=1 + for nip in "${NODE_HOSTS[@]}" + do + if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then + nip='localhost ' + NCMD='' + else + NCMD="ssh root@${nip}" + fi + echo -e "${idsCL[Yellow]}Setting folder permissions for iDS-Node${nid} (${nip})${idsCL[Default]}" + echo -en "${idsCL[Cyan]}LetsEncrypt Certs ${idsCL[Default]}" + ${NCMD} chown -R root:letsencrypt /etc/letsencrypt + ${NCMD} chmod -R 6775 /etc/letsencrypt + 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 "" + nid=`expr $nid + 1` + done + fi nid=1 - for nip in "${NODE_HOSTS[@]}" + for nip in "${WEB_HOSTS[@]}" do if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then nip='localhost ' @@ -1143,24 +1166,16 @@ SET-PERMISSIONS(){ NCMD="ssh root@${nip}" fi if [ "${NEW_SITE}" != "" ]; then - echo -en "${idsCL[Cyan]}iDS-Node${nid} (${nip}) ${idsCL[Default]}" + echo -en "${idsCL[Cyan]}iDS-Webserver${nid} (${nip}) ${idsCL[Default]}" ${NCMD} chown -R www-data:www-data /var/www/$NEW_SITE ${NCMD} chmod -R 7775 /var/www/$NEW_SITE echo -e "${idsCL[Green]}Complete${idsCL[Default]}" else - echo -e "${idsCL[Yellow]}Setting folder permissions for iDS-Node${nid} (${nip})${idsCL[Default]}" - echo -en "${idsCL[Cyan]}LetsEncrypt Certs ${idsCL[Default]}" - ${NCMD} chown -R root:letsencrypt /etc/letsencrypt - ${NCMD} chmod -R 6775 /etc/letsencrypt - echo -e "${idsCL[Green]}Complete${idsCL[Default]}" + echo -e "${idsCL[Yellow]}Setting folder permissions for iDS-Webserver${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 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 -en "${idsCL[Cyan]}Gitea Folder ${idsCL[Default]}" ${NCMD} chown -R git:git /var/lib/gitea ${NCMD} chmod -R 750 /var/lib/gitea