NO_VALUE="no"
W_TLS="tls"
+DNS_ALIAS_PREFIX="="
MODE_STATELESS="stateless"
_STATELESS_WIKI="https://github.com/Neilpang/acme.sh/wiki/Stateless-Mode"
+_DNS_ALIAS_WIKI="https://github.com/Neilpang/acme.sh/wiki/DNS-alias-mode"
+
_DNS_MANUAL_ERR="The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead."
_DNS_MANUAL_WARN="It seems that you are using dns manual mode. please take care: $_DNS_MANUAL_ERR"
_debug "skip dns."
return
fi
-
+ _info "Removing DNS records."
ventries=$(echo "$vlist" | tr ',' ' ')
+ _alias_index=1
for ventry in $ventries; do
d=$(echo "$ventry" | cut -d "$sep" -f 1)
keyauthorization=$(echo "$ventry" | cut -d "$sep" -f 2)
fi
if [ "$vtype" != "$VTYPE_DNS" ]; then
- _info "Skip $d for $vtype"
+ _debug "Skip $d for $vtype"
continue
fi
if _startswith "$_dns_root_d" "*."; then
_dns_root_d="$(echo "$_dns_root_d" | sed 's/*.//')"
fi
- txtdomain="_acme-challenge.$_dns_root_d"
+
+ _d_alias="$(_getfield "$_challenge_alias" "$_alias_index")"
+ _alias_index="$(_math "$_alias_index" + 1)"
+ _debug "_d_alias" "$_d_alias"
+ if [ "$_d_alias" ]; then
+ if _startswith "$_d_alias" "$DNS_ALIAS_PREFIX"; then
+ txtdomain="$(echo "$_d_alias" | sed "s/$DNS_ALIAS_PREFIX//")"
+ else
+ txtdomain="_acme-challenge.$_d_alias"
+ fi
+ else
+ txtdomain="_acme-challenge.$_dns_root_d"
+ fi
if ! $rmcommand "$txtdomain" "$txt"; then
_err "Error removing txt for domain:$txtdomain"
_post_hook="${11}"
_renew_hook="${12}"
_local_addr="${13}"
-
+ _challenge_alias="${14}"
#remove these later.
if [ "$_web_roots" = "dns-cf" ]; then
_web_roots="dns_cf"
else
_cleardomainconf "Le_LocalAddress"
fi
+ if [ "$_challenge_alias" ]; then
+ _savedomainconf "Le_ChallengeAlias" "$_challenge_alias"
+ else
+ _cleardomainconf "Le_ChallengeAlias"
+ fi
Le_API="$ACME_DIRECTORY"
_savedomainconf "Le_API" "$Le_API"
#add entry
dnsadded=""
ventries=$(echo "$vlist" | tr "$dvsep" ' ')
+ _alias_index=1
for ventry in $ventries; do
d=$(echo "$ventry" | cut -d "$sep" -f 1)
keyauthorization=$(echo "$ventry" | cut -d "$sep" -f 2)
if _startswith "$_dns_root_d" "*."; then
_dns_root_d="$(echo "$_dns_root_d" | sed 's/*.//')"
fi
- txtdomain="_acme-challenge.$_dns_root_d"
+ _d_alias="$(_getfield "$_challenge_alias" "$_alias_index")"
+ _alias_index="$(_math "$_alias_index" + 1)"
+ _debug "_d_alias" "$_d_alias"
+ if [ "$_d_alias" ]; then
+ if _startswith "$_d_alias" "$DNS_ALIAS_PREFIX"; then
+ txtdomain="$(echo "$_d_alias" | sed "s/$DNS_ALIAS_PREFIX//")"
+ else
+ txtdomain="_acme-challenge.$_d_alias"
+ fi
+ else
+ txtdomain="_acme-challenge.$_dns_root_d"
+ fi
_debug txtdomain "$txtdomain"
txt="$(printf "%s" "$keyauthorization" | _digest "sha256" | _url_replace)"
_debug txt "$txt"
_info "Your cert key is in $(__green " $CERT_KEY_PATH ")"
fi
- cp "$CERT_PATH" "$CERT_FULLCHAIN_PATH"
+ if [ "$ACME_VERSION" != "2" ]; then
+ cp "$CERT_PATH" "$CERT_FULLCHAIN_PATH"
+ fi
if [ ! "$USER_PATH" ] || [ ! "$IN_CRON" ]; then
USER_PATH="$PATH"
fi
IS_RENEW="1"
- issue "$Le_Webroot" "$Le_Domain" "$Le_Alt" "$Le_Keylength" "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath" "$Le_PreHook" "$Le_PostHook" "$Le_RenewHook" "$Le_LocalAddress"
+ issue "$Le_Webroot" "$Le_Domain" "$Le_Alt" "$Le_Keylength" "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath" "$Le_PreHook" "$Le_PostHook" "$Le_RenewHook" "$Le_LocalAddress" "$Le_ChallengeAlias"
res="$?"
if [ "$res" != "0" ]; then
return "$res"
return 1
fi
+ _real_cert="$3"
+ _real_key="$4"
+ _real_ca="$5"
+ _reload_cmd="$6"
+ _real_fullchain="$7"
+ _pre_hook="${8}"
+ _post_hook="${9}"
+ _renew_hook="${10}"
+ _local_addr="${11}"
+ _challenge_alias="${12}"
+
_csrsubj=$(_readSubjectFromCSR "$_csrfile")
if [ "$?" != "0" ]; then
_err "Can not read subject from csr: $_csrfile"
_info "Copy csr to: $CSR_PATH"
cp "$_csrfile" "$CSR_PATH"
- issue "$_csrW" "$_csrsubj" "$_csrdomainlist" "$_csrkeylength"
+ issue "$_csrW" "$_csrsubj" "$_csrdomainlist" "$_csrkeylength" "$_real_cert" "$_real_key" "$_real_ca" "$_reload_cmd" "$_real_fullchain" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_addr" "$_challenge_alias"
}
}
-# nocron confighome
+# nocron confighome noprofile
install() {
if [ -z "$LE_WORKING_DIR" ]; then
_nocron="$1"
_c_home="$2"
+ _noprofile="$3"
if ! _initpath; then
_err "Install failed."
return 1
_info "Installed to $LE_WORKING_DIR/$PROJECT_ENTRY"
- if [ "$IN_CRON" != "1" ]; then
+ if [ "$IN_CRON" != "1" ] && [ -z "$_noprofile" ]; then
_installalias "$_c_home"
fi
Parameters:
--domain, -d domain.tld Specifies a domain, used to issue, renew or revoke etc.
+ --challenge-alias domain.tld The challenge domain alias for DNS alias mode: $_DNS_ALIAS_WIKI
+ --domain-alias domain.tld The domain alias for DNS alias mode: $_DNS_ALIAS_WIKI
--force, -f Used to force to install or force to renew a cert immediately.
--staging, --test Use staging server, just for test.
--debug Output debug info.
"
}
-# nocron
+# nocron noprofile
_installOnline() {
_info "Installing from online archive."
_nocron="$1"
+ _noprofile="$2"
if [ ! "$BRANCH" ]; then
BRANCH="master"
fi
cd "$PROJECT_NAME-$BRANCH"
chmod +x $PROJECT_ENTRY
- if ./$PROJECT_ENTRY install "$_nocron"; then
+ if ./$PROJECT_ENTRY install "$_nocron" "" "$_noprofile"; then
_info "Install success!"
fi
_initpath
export LE_WORKING_DIR
cd "$LE_WORKING_DIR"
- _installOnline "nocron"
+ _installOnline "nocron" "noprofile"
); then
_info "Upgrade success!"
exit 0
_domain=""
_altdomains="$NO_VALUE"
_webroot=""
+ _challenge_alias=""
_keylength=""
_accountkeylength=""
_cert_file=""
fi
shift
;;
+ --challenge-alias)
+ cvalue="$2"
+ _challenge_alias="$_challenge_alias$cvalue,"
+ shift
+ ;;
+ --domain-alias)
+ cvalue="$DNS_ALIAS_PREFIX$2"
+ _challenge_alias="$_challenge_alias$cvalue,"
+ shift
+ ;;
--standalone)
wvalue="$NO_VALUE"
if [ -z "$_webroot" ]; then
uninstall) uninstall "$_nocron" ;;
upgrade) upgrade ;;
issue)
- issue "$_webroot" "$_domain" "$_altdomains" "$_keylength" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_address"
+ issue "$_webroot" "$_domain" "$_altdomains" "$_keylength" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_address" "$_challenge_alias"
;;
deploy)
deploy "$_domain" "$_deploy_hook" "$_ecc"
;;
signcsr)
- signcsr "$_csr" "$_webroot"
+ signcsr "$_csr" "$_webroot" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_pre_hook" "$_post_hook" "$_renew_hook" "$_local_address" "$_challenge_alias"
;;
showcsr)
showcsr "$_csr" "$_domain"
projects / mirror_acme.sh.git / blobdiff