]> git.street.me.uk Git - andy/dehydrated.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorAndy Street <andy@street.me.uk>
Sun, 12 Mar 2017 14:09:18 +0000 (14:09 +0000)
committerAndy Street <andy@street.me.uk>
Sun, 12 Mar 2017 14:09:18 +0000 (14:09 +0000)
1  2 
dehydrated

diff --cc dehydrated
index e491d89fccd1ede0f83868796c8ee7fd032b12ee,8b31ee1f97cbda486b82455b19c264f5769c6a97..8442dbcee15b4c955d1b76d42d1c6da3700d6129
@@@ -749,17 -846,8 +855,18 @@@ command_sign_domains() 
        done
        IFS="${ORIGIFS}"
      fi
 +
 +    if [[ -n "${ALT_NAMES}" ]]; then
 +      if [[ -n "${morenames}" ]]; then
 +        morenames="${morenames} ${ALT_NAMES}"
 +      else
 +        morenames="${ALT_NAMES}"
 +      fi
 +      line="${domain} ${morenames}";
 +    fi
 +
      verify_config
+     export WELLKNOWN CHALLENGETYPE KEY_ALGO PRIVATE_KEY_ROLLOVER
  
      if [[ -e "${cert}" ]]; then
        printf " + Checking domain name(s) of existing cert..."
    done
  
    # remove temporary domains.txt file if used
 -  [[ -n "${PARAM_DOMAIN:-}" ]] && rm -f "${DOMAINS_TXT}"
 +  [[ "${tmp_domains:-}" = "yes" ]] && rm -f "${DOMAINS_TXT}"
  
+   [[ -n "${HOOK}" ]] && "${HOOK}" "exit_hook"
    exit 0
  }