|
|
|
@ -716,7 +716,7 @@ check_config() { # check the config files for all obvious errors |
|
|
|
config_errors=true |
|
|
|
fi |
|
|
|
|
|
|
|
if [[ validate_via_dns ]]; then # using dns-01 challenge |
|
|
|
if validate_via_dns; then # using dns-01 challenge |
|
|
|
if [[ -z "$DNS_ADD_COMMAND" ]]; then |
|
|
|
info "${DOMAIN}: DNS_ADD_COMMAND not defined (whilst VALIDATE_VIA_DNS='${VALIDATE_VIA_DNS}')" |
|
|
|
config_errors=true |
|
|
|
@ -735,7 +735,7 @@ check_config() { # check the config files for all obvious errors |
|
|
|
if [[ "$(grep "^${d}$" "$tmplist")" = "$d" ]]; then |
|
|
|
info "${DOMAIN}: $d appears to be duplicated in domain, SAN list" |
|
|
|
config_errors=true |
|
|
|
elif [[ "$d" != "${d##\*.}" ]] && ! validate_via_dns $d; then |
|
|
|
elif [[ "$d" != "${d##\*.}" ]] && ! validate_via_dns "$d"; then |
|
|
|
info "${DOMAIN}: cannot use http-01 validation for wildcard domains" |
|
|
|
config_errors=true |
|
|
|
else |
|
|
|
@ -748,7 +748,7 @@ check_config() { # check the config files for all obvious errors |
|
|
|
DOMAIN_ACL="${ACL[$dn]}" |
|
|
|
fi |
|
|
|
|
|
|
|
if ! validate_via_dns $d; then # using http-01 challenge |
|
|
|
if ! validate_via_dns "$d"; then # using http-01 challenge |
|
|
|
if [[ -z "${DOMAIN_ACL}" ]]; then |
|
|
|
info "${DOMAIN}: ACL location not specified for domain $d in $DOMAIN_DIR/getssl.cfg" |
|
|
|
config_errors=true |
|
|
|
@ -1422,7 +1422,7 @@ for d in "${alldomains[@]}"; do |
|
|
|
((dn++)) |
|
|
|
else |
|
|
|
PREVIOUSLY_VALIDATED="false" |
|
|
|
if validate_via_dns $d; then # set up the correct DNS token for verification |
|
|
|
if validate_via_dns "$d"; then # set up the correct DNS token for verification |
|
|
|
if [[ $API -eq 1 ]]; then |
|
|
|
# get the dns component of the ACME response |
|
|
|
# get the token and uri from the dns component |
|
|
|
|