Improving output messages

Author: bfren

overlay/etc/ssl/inc/setup-global.sh

@@ -11,13 +11,13 @@ setup_global () {
         gomplate \
             -o ${SSL_GLOBAL_CFG} \
             -f ${TEMPLATES}/global.conf.tmpl
-        _done
+        _ok " - done."
     fi
 
     if [ ! -f ${SSL_DHPARAM} ] ; then
         _echo " - generating dhparam..."
         openssl dhparam -out ${SSL_DHPARAM} ${SSL_DHPARAM_BITS}
-        _done
+        _ok " - done."
     fi
 
 }

overlay/etc/ssl/inc/setup-nginx.sh

@@ -16,7 +16,7 @@ setup_nginx () {
     local FILE=${SITES}/${DOMAIN_NAME}
 
     # check for existing configuration
-    [[ -f ${FILE} ]] && return 0 || _echo " - nginx..."
+    [[ -f ${FILE} ]] && _ok " - already set up." && return 0
 
     # build domain list and remove trailing / multiple spaces between domains
     TMP="${DOMAIN_NAME}$(printf " %s" ${DOMAIN_ALIASES[@]})"
@@ -27,4 +27,6 @@ setup_nginx () {
         -o ${FILE} \
         -f ${TEMPLATES}/site.conf.tmpl
 
+    _ok " - done."
+
 }

overlay/etc/ssl/inc/setup-ssl.sh

@@ -33,7 +33,7 @@ setup_ssl () {
     local FILE=${SSL_CERTS}/${DOMAIN_NAME}/${GETSSL_CFG}
 
     # check for existing configuration
-    [[ -f ${FILE} ]] && return 0 || _echo " - SSL..."
+    [[ -f ${FILE} ]] && _ok " - already set up." && return 0
 
     # -U stop upgrade checks
     # -w set working directory
@@ -56,5 +56,8 @@ setup_ssl () {
     # create self-signed certificate so nginx will start before we request proper certificates
     generate_temp_cert ${CERT}/fullchain.crt ${CERT}.key ${DOMAIN_NAME}
     generate_temp_cert ${CERT}/chain.crt ${CERT}/chain.key ${DOMAIN_NAME}
+    rm ${CERT}/chain.key
+    
+    _ok " - done."
 
 }

overlay/etc/ssl/init

@@ -21,7 +21,7 @@ source ${INC}/setup-ssl.sh
 # Set up global SSL configuration
 #======================================================================================================================
 
-_echo "Setting up getssl environment..."
+_echo "Setting up getssl..."
 setup_global
 _done
 
@@ -32,11 +32,14 @@ _done
 
 _echo "Setting up domains..."
 for D in "${!DOMAINS[@]}" ; do
-    _echo " - ${D}"
     U=${DOMAINS[$D]}        # upstream server
     A=(${ALIASES[${D}]})    # domain aliases
+    
+    _echo " - ${D}: Nginx..."
     setup_nginx ${D} ${U} A
+
+    _echo " - ${D}: SSL..."
     setup_ssl ${D} A
-    _ok " - done."
+    _ok " - ${D} done."
 done
 _done

overlay/etc/ssl/request

@@ -16,6 +16,6 @@ source ${INC}/check.sh
 _echo "Requesting SSL certificates..."
 for D in "${!DOMAINS[@]}" ; do
     _echo " - ${D}"
-    /etc/ssl/getssl -U -w ${SSL_CERTS} ${D} || _error "Unable to request certificate for ${D}."
+    /etc/ssl/getssl -U -w ${SSL_CERTS} ${D} || _error " - unable to request certificate for ${D}."
 done
 _done