From f5fdd71681547fa0959f5890a359e809ad747b01 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Tue, 12 Sep 2017 15:49:29 +0200 Subject: [PATCH] evoacme: fix invalid domain printing in make-csr --- evoacme/files/make-csr.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/evoacme/files/make-csr.sh b/evoacme/files/make-csr.sh index 7a510009..4d05b306 100755 --- a/evoacme/files/make-csr.sh +++ b/evoacme/files/make-csr.sh @@ -20,27 +20,26 @@ get_domains() { valid_domains="" nb=0 - echo "Domain(s) in $vhost :" - for domain in $domains - do + echo "Valid(s) domain(s) in $vhost :" + for domain in $domains; do real_ip=$(dig +short "$domain"|grep -oE "([0-9]+\.){3}[0-9]+") for ip in $(echo "$SRV_IP"|xargs -n1); do if [ "${ip}" = "${real_ip}" ]; then valid_domains="$valid_domains $domain" nb=$(( nb + 1 )) - echo "* $domain : OK ($real_ip)" - else - echo "* $domain : INVALID ($real_ip)" + echo "* $domain -> $real_ip" fi done done if [ "$nb" -eq 0 ]; then nb=$(echo "$domains"|wc -l) - echo "No valid domain found, all domains will be used for CSR creation." - domains="$domains" + echo "* No valid domain found" + echo "All following(s) domain(s) will be used for CSR creation :" + for domain in $domains; do + echo "* $domain" + done else - echo "CSR will be created only with valid domains." domains="$valid_domains" fi domains=$(echo "$domains"|xargs -n1)