diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 3b06b44d..d866a9e9 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -760,9 +760,9 @@ DELSITE(){ echo "" echo -e "Usage: ${idsCL[Yellow]}nodemgmt delsite${idsCL[Default]} {" width=33 - printf "%-${width}s- %s\n" " -site {FQDN address}" '(*required)' + printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)" printf "%-${width}s- %s\n" " -ssl {yes or [no]}" "Delete SSL certs as well" - printf "%-${width}s- %s\n" " -list" 'List sites (same as running nodemgmt delsites)' + printf "%-${width}s- %s\n" " -list" "List sites (same as running nodemgmt delsites)" echo "}" exit 1;; esac @@ -797,7 +797,7 @@ DELSITE(){ else NCMD="ssh root@${nip}" fi - echo -en "Removing from iDS-Node${nid} \($nip\)... ${idsCL[Default]}" + echo -en "Removing from iDS-Node${nid} ($nip)... ${idsCL[Default]}" #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} @@ -823,7 +823,7 @@ DELSITE(){ width=33 printf "%-${width}s- %s\n" " -site {FQDN address}" "Site to delete" printf "%-${width}s- %s\n" " -ssl {yes or [no]}" "Delete SSL certs as well" - printf "%-${width}s- %s\n" " -list" 'List sites (same as running nodemgmt delsites)' + printf "%-${width}s- %s\n" " -list" "List sites (same as running nodemgmt delsites)" echo "}" exit 1 fi @@ -903,12 +903,12 @@ NEWSITE(){ echo "" echo -e "Usage: ${idsCL[Yellow]}nodemgmt newcert${idsCL[Default]} {" width=33 - printf "%-${width}s- %s\n" " -site {FQDN address\(,es\)}" '(new site and aliases, comma separated)' - printf "%-${width}s- %s\n" " -ssl {yes or no}" '(defaults to yes)' - printf "%-${width}s- %s\n" " -type {'local' or 'proxy'}" '(defaults to local)' - printf "%-${width}s- %s\n" " -port {host port}" '(proxy backend host)' - printf "%-${width}s- %s\n" " -host {IP or FQDN}" '(proxy backend port)' - printf "%-${width}s- %s\n" " -scheme {http or https}" '(proxy backend scheme)' + printf "%-${width}s- %s\n" " -site {FQDN address(,es)}" "(new site and aliases, comma separated)" + printf "%-${width}s- %s\n" " -ssl {yes or no}" "(defaults to yes)" + printf "%-${width}s- %s\n" " -type {'local' or 'proxy'}" "(defaults to local)" + printf "%-${width}s- %s\n" " -port {host port}" "(proxy backend host)" + printf "%-${width}s- %s\n" " -host {IP or FQDN}" "(proxy backend port)" + printf "%-${width}s- %s\n" " -scheme {http or https}" "(proxy backend scheme)" echo "}" exit 1;; esac @@ -933,7 +933,7 @@ NEWSITE(){ fi fi if [ -z ${SITE_TYPE+x} ]; then - echo -e -n "${idsCL[LightCyan]}Site type \([local]/proxy\): ${idsCL[Default]}" + echo -e -n "${idsCL[LightCyan]}Site type ([local]/proxy): ${idsCL[Default]}" read SITE_TYPE showdivide=yes if [ "${SITE_TYPE}" != "proxy" ]; then @@ -942,17 +942,17 @@ NEWSITE(){ fi if [ "${SITE_TYPE}" = "proxy" ]; then if [ -z ${PROXYHOST+x} ]; then - echo -e -n "${idsCL[LightCyan]}What is the proxy backend address \(IP or FQDN\): ${idsCL[Default]}" + echo -e -n "${idsCL[LightCyan]}What is the proxy backend address (IP or FQDN): ${idsCL[Default]}" read PROXYHOST showdivide=yes fi if [ -z ${PROXYPORT+x} ]; then - echo -e -n "${idsCL[LightCyan]}What is the proxy backend port \(tcp port\): ${idsCL[Default]}" + echo -e -n "${idsCL[LightCyan]}What is the proxy backend port (tcp port): ${idsCL[Default]}" read PROXYPORT showdivide=yes fi if [ -z ${PROXYSCHEME+x} ]; then - echo -e -n "${idsCL[LightCyan]}What is the proxy backend scheme \(http/https\): ${idsCL[Default]}" + echo -e -n "${idsCL[LightCyan]}What is the proxy backend scheme (http/https): ${idsCL[Default]}" read PROXYSCHEME showdivide=yes fi