From 43376b1272981c6530b711ee7a7899d280a9a7ff Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 5 Feb 2019 21:17:39 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 74 +++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 20 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 02c355e0..1965f6af 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -194,9 +194,9 @@ DELSITE(){ NCMD="ssh root@${nip}" fi echo -en "Removing from iDS-Node${nid} ($nip)... ${idsCL[Default]}" - if [ -f /etc/nginx/sites-available/${DEL_SITE}.conf ]; then - ${NCMD} rm -f /etc/nginx/sites-available/${DEL_SITE}.conf - ${NCMD} rm -f /etc/nginx/sites-enabled/${DEL_SITE}.conf + if [ -f /etc/nginx/sites-available/${DEL_SITE} ]; then + ${NCMD} rm -f /etc/nginx/sites-available/${DEL_SITE} + ${NCMD} rm -f /etc/nginx/sites-enabled/${DEL_SITE} fi if [ -d /var/www/${DEL_SITE} ]; then ${NCMD} rm -rf /var/www/${DEL_SITE} @@ -217,6 +217,40 @@ DELSITE(){ fi } +DELSITES(){ + echo -e "${idsCL[Green]}Select a site to delete...${idsCL[Default]}" + DIVIDER true + + + while : + do + echo " [1] Node Status" + + echo "" + echo " [Q] Quit" + echo "" + echo "" + echo -e -n "${idsCL[LightYellow]}Please select an [ActionItem] from above:${idsCL[Default]} " + read -n 1 opt + echo "" + case $opt in + 1) STATUS; GUI;; + 2) GUI;; + 3) GUI;; + 4) GUI;; + 5) GUI;; + 6) CERTRENEW; GUI;; + 7) LISTCERTS; GUI;; + 8) SET-PERMISSIONS; GUI;; + [Bb]) GUI;; + [Qq]) EXIT1;exit 0;; + *) echo "Thats an invaild option,"; + echo "please select a valid option only."; + sleep 1;; + esac + done +} + NEWSITE(){ while [ $# -gt 0 ]; do case "$1" in @@ -266,9 +300,9 @@ NEWSITE(){ echo "" if [ "${SITE_TYPE}" = "local" ]; then echo -e "server { - listen 8080;" > /etc/nginx/sites-available/${MAIN_SITE}.conf + listen 8080;" > /etc/nginx/sites-available/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then - echo -e " listen 8443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + echo -e " listen 8443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE} fi echo -e " server_name ${NGINX_SERVERNAME}; @@ -277,21 +311,21 @@ NEWSITE(){ root \$base/public_html; access_log /var/log/nginx/${MAIN_SITE}-access.log; - error_log /var/log/nginx/${MAIN_SITE}-error.log warn;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + error_log /var/log/nginx/${MAIN_SITE}-error.log warn;" >> /etc/nginx/sites-available/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then echo -e " ssl_certificate /etc/letsencrypt/live/${MAIN_SITE}/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/${MAIN_SITE}/privkey.pem; - include conf.d/include/ssl-ciphers.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + include conf.d/include/ssl-ciphers.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} fi echo -e " index index.php; location / { - try_files \$uri \$uri/ /index.php?\$query_string;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + try_files \$uri \$uri/ /index.php?\$query_string;" >> /etc/nginx/sites-available/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then - echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} fi echo -e " } @@ -300,11 +334,11 @@ NEWSITE(){ include conf.d/include/php_fastcgi.conf; } - include conf.d/include/general.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + include conf.d/include/general.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then - echo -e " include conf.d/include/letsencrypt-acme-challenge.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + echo -e " include conf.d/include/letsencrypt-acme-challenge.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} fi - echo -e "}" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + echo -e "}" >> /etc/nginx/sites-available/${MAIN_SITE} for nip in "${NODE_HOSTS[@]}" do @@ -322,32 +356,32 @@ NEWSITE(){ set \$server \"${PROXYHOST}\"; set \$port ${PROXYPORT}; - listen 8080;" > /etc/nginx/sites-available/${MAIN_SITE}.conf + listen 8080;" > /etc/nginx/sites-available/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then - echo -e " listen 8443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + echo -e " listen 8443 ssl http2;" >> /etc/nginx/sites-available/${MAIN_SITE} fi echo -e " - server_name ${NGINX_SERVERNAME};" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + server_name ${NGINX_SERVERNAME};" >> /etc/nginx/sites-available/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then echo -e " include conf.d/include/letsencrypt-acme-challenge.conf; include conf.d/include/ssl-ciphers.conf; ssl_certificate /etc/letsencrypt/live/${MAIN_SITE}/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/${MAIN_SITE}/privkey.pem;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + ssl_certificate_key /etc/letsencrypt/live/${MAIN_SITE}/privkey.pem;" >> /etc/nginx/sites-available/${MAIN_SITE} fi echo -e " access_log /var/log/nginx/proxy-${MAIN_SITE}.log proxy; - location / {" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + location / {" >> /etc/nginx/sites-available/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then - echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE}.conf + echo -e " include conf.d/include/force-ssl.conf;" >> /etc/nginx/sites-available/${MAIN_SITE} fi echo -e " include conf.d/include/proxy.conf; } } -" >> /etc/nginx/sites-available/${MAIN_SITE}.conf +" >> /etc/nginx/sites-available/${MAIN_SITE} fi - ln -s /etc/nginx/sites-available/${MAIN_SITE}.conf /etc/nginx/sites-enabled/${MAIN_SITE}.conf + ln -s /etc/nginx/sites-available/${MAIN_SITE} /etc/nginx/sites-enabled/${MAIN_SITE} if [ "${CREATE_SSL}" = "true" ]; then NEWCERT ${NEW_SITE} else