diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 4bb63976..c117cbab 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -82,10 +82,11 @@ case "$1" in esac done - echo -e "${idsCL[LightGreen]}Setting up new site for '${idsCL[Yellow]}${NEW_SITE}${idsCL[LightGreen]}'...${idsCL[Default]}" - echo "" - mkdir -p /var/www/${NEW_SITE}/{public_folder,nginx_logs} - echo -e "server { + if [ "${NEW_SITE}" != "" ] && [ "${SITE_TYPE}" != "" ]; then + echo -e "${idsCL[LightGreen]}Setting up new site for '${idsCL[Yellow]}${NEW_SITE}${idsCL[LightGreen]}'...${idsCL[Default]}" + echo "" + mkdir -p /var/www/${NEW_SITE}/{public_folder,nginx_logs} + echo -e "server { listen 8443 ssl http2; listen 8080; @@ -117,15 +118,20 @@ case "$1" in include conf.d/include/letsencrypt-acme-challenge.conf; } " > /etc/nginx/sites-available/${NEW_SITE}.conf - ln -s /etc/nginx/sites-available/${NEW_SITE}.conf /etc/nginx/sites-enabled/${NEW_SITE}.conf - echo "Site folders have been created." - echo -e "${idsCL[LightGreen]}Waiting for folder replication between the nodes...${idsCL[Default]}" - sleep 20 - nodemgmt set-permissions ${NEW_SITE} - nodemgmt newcert ${NEW_SITE} - echo "" - echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}" - echo "" + ln -s /etc/nginx/sites-available/${NEW_SITE}.conf /etc/nginx/sites-enabled/${NEW_SITE}.conf + echo "Site folders have been created." + echo -e "${idsCL[LightGreen]}Waiting for folder replication between the nodes...${idsCL[Default]}" + sleep 20 + nodemgmt set-permissions ${NEW_SITE} + nodemgmt newcert ${NEW_SITE} + echo "" + echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}" + echo "" + else + echo "Missing parameters" + echo "" + echo -e "Usage: ${idsCL[Yellow]}nodemgmt newcert${idsCL[Default]} { ${idsCL[Yellow]}-site${idsCL[Default]} {domain address} | ${idsCL[Yellow]}-type${idsCL[Default]} {'local' or 'proxy'} | ${idsCL[ Yellow]}-ssl${idsCL[Default]} {true or false} | ${idsCL[Yellow]}certrenew${idsCL[Default]} | ${idsCL[ Yellow]}-proxy_scheme${idsCL[Default]} {http or https} | ${idsCL[ Yellow]}-proxy_host${idsCL[Default]} {IP or FQDN} | ${idsCL[ Yellow]}-proxy_port${idsCL[Default]} {host port} }" + fi ;; update)