readability and whitespaces

evoacme/files/evoacme.sh

@@ -25,10 +25,14 @@ EOT
 }
 
 log() {
-    [ "${QUIET}" != "1" ] && echo "${PROGNAME}: $1"
+    if [ "${QUIET}" != "1" ]; then
+        echo "${PROGNAME}: $1"
+    fi
 }
 debug() {
-    [ "${VERBOSE}" = "1" ] && [ "${QUIET}" != "1" ] && >&2 echo "${PROGNAME}: $1"
+    if [ "${VERBOSE}" = "1" ] && [ "${QUIET}" != "1" ]; then
+        >&2 echo "${PROGNAME}: $1"
+    fi
 }
 error() {
     >&2 echo "${PROGNAME}: $1"

evoacme/files/vhost-domains.sh

@@ -24,7 +24,9 @@ EOT
 }
 
 debug() {
-    [ "${VERBOSE}" = 1 ] && >&2 echo "${PROGNAME}: $1"
+    if [ "${VERBOSE}" = 1 ]; then
+        >&2 echo "${PROGNAME}: $1"
+    fi
 }
 error() {
     >&2 echo "${PROGNAME}: $1"
@@ -32,113 +34,113 @@ error() {
 }
 
 real_ip_for_domain() {
-  dig +short "$1" | grep -oE "([0-9]+\.){3}[0-9]+"
+    dig +short "$1" | grep -oE "([0-9]+\.){3}[0-9]+"
 }
 local_ip() {
-  ip a | grep brd | cut -d'/' -f1 | grep -oE "([0-9]+\.){3}[0-9]+"
+    ip a | grep brd | cut -d'/' -f1 | grep -oE "([0-9]+\.){3}[0-9]+"
 }
 
 nginx_domains() {
-  local vhost_file="$1"
+    local vhost_file="$1"
 
-  grep -oE "^( )*[^#]+" "${vhost_file}" \
-  | grep -oE "[^\$]server_name.*;$" \
-  | sed 's/server_name//' \
-  | tr -d ';' \
-  | sed 's/\s\{1,\}//' \
-  | sed 's/\s\{1,\}/\n/g' \
-  | sort \
-  | uniq
+    grep -oE "^( )*[^#]+" "${vhost_file}" \
+        | grep -oE "[^\$]server_name.*;$" \
+        | sed 's/server_name//' \
+        | tr -d ';' \
+        | sed 's/\s\{1,\}//' \
+        | sed 's/\s\{1,\}/\n/g' \
+        | sort \
+        | uniq
 }
 
 apache_domains() {
-  local vhost_file="$1"
+    local vhost_file="$1"
 
-  grep -oE "^( )*[^#]+" "${vhost_file}" \
-  | grep -oE "(ServerName|ServerAlias).*" \
-  | sed 's/ServerName//' \
-  | sed 's/ServerAlias//' \
-  | sed 's/\s\{1,\}//' \
-  | sort \
-  | uniq
+    grep -oE "^( )*[^#]+" "${vhost_file}" \
+        | grep -oE "(ServerName|ServerAlias).*" \
+        | sed 's/ServerName//' \
+        | sed 's/ServerAlias//' \
+        | sed 's/\s\{1,\}//' \
+        | sort \
+        | uniq
 }
 
 get_domains() {
-  local vhost_file="$1"
-  local ips="$2"
-  local domains=""
-  local valid_domains=""
-  local nb=0
+    local vhost_file="$1"
+    local ips="$2"
+    local domains=""
+    local valid_domains=""
+    local nb=0
 
-  if $(echo "${vhost_file}" | grep -q nginx); then
-    debug "Nginx vhost file used"
-    domains=$(nginx_domains "${vhost_file}")
-  fi
-  if $(echo "${vhost_file}" | grep -q apache2); then
-    debug "Apache vhost file used"
-    domains=$(apache_domains "${vhost_file}")
-  fi
+    if $(echo "${vhost_file}" | grep -q nginx); then
+        debug "Nginx vhost file used"
+        domains=$(nginx_domains "${vhost_file}")
+    fi
+    if $(echo "${vhost_file}" | grep -q apache2); then
+        debug "Apache vhost file used"
+        domains=$(apache_domains "${vhost_file}")
+    fi
 
-  debug "Valid(s) domain(s) in ${vhost_file} :"
-  for domain in ${domains}; do
-    real_ip=$(real_ip_for_domain "${domain}")
-    for ip in $(echo "${ips}" | xargs -n1); do
-      if [ "${ip}" = "${real_ip}" ]; then
-        valid_domains="${valid_domains} ${domain}"
-        nb=$(( nb  + 1 ))
-        debug "* ${domain} -> ${real_ip}"
-      fi
-    done
-  done
-
-  if [ "${nb}" -eq 0 ]; then
-    nb=$(echo "${domains}" | wc -l)
-    debug "* No valid domain found"
-    debug "All following(s) domain(s) will be used for CSR creation :"
+    debug "Valid(s) domain(s) in ${vhost_file} :"
     for domain in ${domains}; do
-      debug "* ${domain}"
+        real_ip=$(real_ip_for_domain "${domain}")
+        for ip in $(echo "${ips}" | xargs -n1); do
+            if [ "${ip}" = "${real_ip}" ]; then
+                valid_domains="${valid_domains} ${domain}"
+                nb=$(( nb  + 1 ))
+                debug "* ${domain} -> ${real_ip}"
+            fi
+        done
     done
-  else
-    domains="${valid_domains}"
-  fi
 
-  echo "${domains}" | xargs -n 1
+    if [ "${nb}" -eq 0 ]; then
+        nb=$(echo "${domains}" | wc -l)
+        debug "* No valid domain found"
+        debug "All following(s) domain(s) will be used for CSR creation :"
+        for domain in ${domains}; do
+            debug "* ${domain}"
+        done
+    else
+        domains="${valid_domains}"
+    fi
+
+    echo "${domains}" | xargs -n 1
 }
 
 first_vhost_file_found() {
-  local vhost_name="$1"
+    local vhost_name="$1"
 
-  ls "/etc/nginx/sites-enabled/${vhost_name}" \
-     "/etc/nginx/sites-enabled/${vhost_name}.conf" \
-     "/etc/apache2/sites-enabled/${vhost_name}.conf" \
-    2>/dev/null \
-    | head -n 1
+    ls "/etc/nginx/sites-enabled/${vhost_name}" \
+       "/etc/nginx/sites-enabled/${vhost_name}.conf" \
+       "/etc/apache2/sites-enabled/${vhost_name}.conf" \
+        2>/dev/null \
+        | head -n 1
 }
 
 main() {
-  if [ "$#" != 1 ]; then
-    >&2 usage
-    exit 1
-  fi
-  if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
-    usage
-    exit 0
-  fi
+    if [ "$#" != 1 ]; then
+        >&2 usage
+        exit 1
+    fi
+    if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+        usage
+        exit 0
+    fi
 
-  local vhost_name=$(basename "$1" .conf)
-  local vhost_file=$(first_vhost_file_found "${vhost_name}")
+    local vhost_name=$(basename "$1" .conf)
+    local vhost_file=$(first_vhost_file_found "${vhost_name}")
 
-  if [ ! -h "${vhost_file}" ]; then
-    >&2 echo "No virtualhost has been found for '${vhost_name}'."
-    exit 1
-  fi
+    if [ ! -h "${vhost_file}" ]; then
+        >&2 echo "No virtualhost has been found for '${vhost_name}'."
+        exit 1
+    fi
 
-  local ips=$(local_ip)
-  if [ -n "${SRV_IP}" ]; then
-    ips="${ips} ${SRV_IP}"
-  fi
+    local ips=$(local_ip)
+    if [ -n "${SRV_IP}" ]; then
+        ips="${ips} ${SRV_IP}"
+    fi
 
-  get_domains "${vhost_file}" "${ips}"
+    get_domains "${vhost_file}" "${ips}"
 }
 
 readonly PROGNAME=$(basename "$0")