From 64bfd38d33c9b14cc91de83056223821a272dd25 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 4 Mar 2019 00:09:12 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 114 ++++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 51 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 95431d81..8b277edb 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1172,13 +1172,42 @@ NEWSITE(){ } SET-PERMISSIONS(){ - if [ "${1}" != "" ]; then - NEW_SITE=${1} - echo -e "${idsCL[Yellow]}Setting new site folder permissions for (/var/www/${NEW_SITE})${idsCL[Default]}" - fi - if [ "${NEW_SITE}" = "" ]; then + if [ "${1}" = "gitea" ]; then + for nip in "${WEB_HOSTS[@]}"; do + if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then + NCMD='' + else + NCMD="ssh root@${nip}" + fi + ${NCMD} chown -R git:git /var/lib/gitea + ${NCMD} chmod -R 750 /var/lib/gitea + done + else + if [ "${1}" != "" ]; then + 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-MySQL${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 "" + 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 ' @@ -1186,54 +1215,37 @@ SET-PERMISSIONS(){ else NCMD="ssh root@${nip}" fi - echo -e "${idsCL[Yellow]}Setting folder permissions for iDS-MySQL${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 "" + if [ "${NEW_SITE}" != "" ]; then + 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-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]}Gitea Folder ${idsCL[Default]}" + ${NCMD} chown -R git:git /var/lib/gitea + ${NCMD} chmod -R 750 /var/lib/gitea + echo -e "${idsCL[Green]}Complete${idsCL[Def ault]}" + 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 "" + fi nid=`expr $nid + 1` done - fi - nid=1 - for nip in "${WEB_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}" + if [ "${NEW_SITE}" != "" ]; then echo ""; fi + if [ -z $action ] || [ "${action}" = "gui" ]; then + ENTER2CONTINUE fi - if [ "${NEW_SITE}" != "" ]; then - 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-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]}Gitea Folder ${idsCL[Default]}" - ${NCMD} chown -R git:git /var/lib/gitea - ${NCMD} chmod -R 750 /var/lib/gitea - echo -e "${idsCL[Green]}Complete${idsCL[Def ault]}" - 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 "" - fi - nid=`expr $nid + 1` - done - if [ "${NEW_SITE}" != "" ]; then echo ""; fi - if [ -z $action ] || [ "${action}" = "gui" ]; then - ENTER2CONTINUE fi }