update

inc/sites.inc

@@ -195,9 +195,11 @@ LISTSITES(){
 }
 
 NEWSITE(){
+	CERTTEST=0
 	echo
 	while [ $# -gt 0 ]; do
 		case "$1" in
+			-test) CERTTEST=1;;
 			-site) NEW_SITE=${2};;
 			-type) SITE_TYPE=${2};;
 			-ssl) CREATE_SSL=${2};;
@@ -454,7 +456,7 @@ NEWSITE(){
 			fi
 			
 			if [ "${CREATE_SSL}" = "yes" ]; then
-				[ "${ssladd}" != "" ] && NEWCERT ${NEW_SITE},${ssladd} newsite || NEWCERT ${NEW_SITE} newsite
+				[ "${ssladd}" != "" ] && NEWCERT ${NEW_SITE},${ssladd} newsite ${CERTTEST} || NEWCERT ${NEW_SITE} newsite ${CERTTEST}
 				# if [ "${SITE_TYPE}" == "proxy" ]; then
 					sed -i "s/#ssl_certificate/ssl_certificate/g" ${nginxconfig}
 				# fi
@@ -471,27 +473,11 @@ NEWSITE(){
 			echo
 			echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}"
 			echo
-			echo -e -n "${idsCL[LightCyan]}Reload NGINX on LB Nodes (Y/n): ${idsCL[Default]}"
+			echo -e -n "${idsCL[LightCyan]}Reload NGINX on all Nodes (Y/n): ${idsCL[Default]}"
 			read -n 1 NGINXRELOAD
 			if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
 				tmp=''
 			else
-				# echo
-				# echo -en "${idsCL[LightYellow]}Verifying '${NEW_SITE}' replication across the nodes... ${idsCL[Default]}"
-				# for nip in "${NM_HOSTS['LB'][@]}"; do
-				# 	checkhost=$(CHECK_HOST ${nip})
-				# 	if [ "${checkhost}" != "false" ]; then
-				# 		if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
-				# 			checked=false
-				# 			until [ "${checked}" = "" ]; do
-				# 				checked=`ssh root@${nip} "[ ! -f ${nginxconfig} ] && echo '.'"`
-				# 			done
-				# 		fi
-				# 	fi
-				# done
-				# rm -f ${NM_CERTPATH}/live/${MAIN_CERT}/newcert
-				# echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
-		
 				echo
 				SERVICE nginx restart
 			fi