[](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+[](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[](https://hub.docker.com/r/neilpang/acme.sh "Click to view the image on Docker Hub")
[](https://hub.docker.com/r/neilpang/acme.sh "Click to view the image on Docker Hub")
-
+
acme.sh is being sponsored by the following tool; please help to support us by taking a look and signing up to a free trial
diff --git a/acme.sh b/acme.sh
index e0f11e30..45e0c246 100755
--- a/acme.sh
+++ b/acme.sh
@@ -524,27 +524,27 @@ _math() {
_h_char_2_dec() {
_ch=$1
case "${_ch}" in
- a | A)
- printf "10"
- ;;
- b | B)
- printf "11"
- ;;
- c | C)
- printf "12"
- ;;
- d | D)
- printf "13"
- ;;
- e | E)
- printf "14"
- ;;
- f | F)
- printf "15"
- ;;
- *)
- printf "%s" "$_ch"
- ;;
+ a | A)
+ printf "10"
+ ;;
+ b | B)
+ printf "11"
+ ;;
+ c | C)
+ printf "12"
+ ;;
+ d | D)
+ printf "13"
+ ;;
+ e | E)
+ printf "14"
+ ;;
+ f | F)
+ printf "15"
+ ;;
+ *)
+ printf "%s" "$_ch"
+ ;;
esac
}
@@ -652,211 +652,211 @@ _url_encode() {
for _hex_code in $_hex_str; do
#upper case
case "${_hex_code}" in
- "41")
- printf "%s" "A"
- ;;
- "42")
- printf "%s" "B"
- ;;
- "43")
- printf "%s" "C"
- ;;
- "44")
- printf "%s" "D"
- ;;
- "45")
- printf "%s" "E"
- ;;
- "46")
- printf "%s" "F"
- ;;
- "47")
- printf "%s" "G"
- ;;
- "48")
- printf "%s" "H"
- ;;
- "49")
- printf "%s" "I"
- ;;
- "4a")
- printf "%s" "J"
- ;;
- "4b")
- printf "%s" "K"
- ;;
- "4c")
- printf "%s" "L"
- ;;
- "4d")
- printf "%s" "M"
- ;;
- "4e")
- printf "%s" "N"
- ;;
- "4f")
- printf "%s" "O"
- ;;
- "50")
- printf "%s" "P"
- ;;
- "51")
- printf "%s" "Q"
- ;;
- "52")
- printf "%s" "R"
- ;;
- "53")
- printf "%s" "S"
- ;;
- "54")
- printf "%s" "T"
- ;;
- "55")
- printf "%s" "U"
- ;;
- "56")
- printf "%s" "V"
- ;;
- "57")
- printf "%s" "W"
- ;;
- "58")
- printf "%s" "X"
- ;;
- "59")
- printf "%s" "Y"
- ;;
- "5a")
- printf "%s" "Z"
- ;;
+ "41")
+ printf "%s" "A"
+ ;;
+ "42")
+ printf "%s" "B"
+ ;;
+ "43")
+ printf "%s" "C"
+ ;;
+ "44")
+ printf "%s" "D"
+ ;;
+ "45")
+ printf "%s" "E"
+ ;;
+ "46")
+ printf "%s" "F"
+ ;;
+ "47")
+ printf "%s" "G"
+ ;;
+ "48")
+ printf "%s" "H"
+ ;;
+ "49")
+ printf "%s" "I"
+ ;;
+ "4a")
+ printf "%s" "J"
+ ;;
+ "4b")
+ printf "%s" "K"
+ ;;
+ "4c")
+ printf "%s" "L"
+ ;;
+ "4d")
+ printf "%s" "M"
+ ;;
+ "4e")
+ printf "%s" "N"
+ ;;
+ "4f")
+ printf "%s" "O"
+ ;;
+ "50")
+ printf "%s" "P"
+ ;;
+ "51")
+ printf "%s" "Q"
+ ;;
+ "52")
+ printf "%s" "R"
+ ;;
+ "53")
+ printf "%s" "S"
+ ;;
+ "54")
+ printf "%s" "T"
+ ;;
+ "55")
+ printf "%s" "U"
+ ;;
+ "56")
+ printf "%s" "V"
+ ;;
+ "57")
+ printf "%s" "W"
+ ;;
+ "58")
+ printf "%s" "X"
+ ;;
+ "59")
+ printf "%s" "Y"
+ ;;
+ "5a")
+ printf "%s" "Z"
+ ;;
#lower case
- "61")
- printf "%s" "a"
- ;;
- "62")
- printf "%s" "b"
- ;;
- "63")
- printf "%s" "c"
- ;;
- "64")
- printf "%s" "d"
- ;;
- "65")
- printf "%s" "e"
- ;;
- "66")
- printf "%s" "f"
- ;;
- "67")
- printf "%s" "g"
- ;;
- "68")
- printf "%s" "h"
- ;;
- "69")
- printf "%s" "i"
- ;;
- "6a")
- printf "%s" "j"
- ;;
- "6b")
- printf "%s" "k"
- ;;
- "6c")
- printf "%s" "l"
- ;;
- "6d")
- printf "%s" "m"
- ;;
- "6e")
- printf "%s" "n"
- ;;
- "6f")
- printf "%s" "o"
- ;;
- "70")
- printf "%s" "p"
- ;;
- "71")
- printf "%s" "q"
- ;;
- "72")
- printf "%s" "r"
- ;;
- "73")
- printf "%s" "s"
- ;;
- "74")
- printf "%s" "t"
- ;;
- "75")
- printf "%s" "u"
- ;;
- "76")
- printf "%s" "v"
- ;;
- "77")
- printf "%s" "w"
- ;;
- "78")
- printf "%s" "x"
- ;;
- "79")
- printf "%s" "y"
- ;;
- "7a")
- printf "%s" "z"
- ;;
+ "61")
+ printf "%s" "a"
+ ;;
+ "62")
+ printf "%s" "b"
+ ;;
+ "63")
+ printf "%s" "c"
+ ;;
+ "64")
+ printf "%s" "d"
+ ;;
+ "65")
+ printf "%s" "e"
+ ;;
+ "66")
+ printf "%s" "f"
+ ;;
+ "67")
+ printf "%s" "g"
+ ;;
+ "68")
+ printf "%s" "h"
+ ;;
+ "69")
+ printf "%s" "i"
+ ;;
+ "6a")
+ printf "%s" "j"
+ ;;
+ "6b")
+ printf "%s" "k"
+ ;;
+ "6c")
+ printf "%s" "l"
+ ;;
+ "6d")
+ printf "%s" "m"
+ ;;
+ "6e")
+ printf "%s" "n"
+ ;;
+ "6f")
+ printf "%s" "o"
+ ;;
+ "70")
+ printf "%s" "p"
+ ;;
+ "71")
+ printf "%s" "q"
+ ;;
+ "72")
+ printf "%s" "r"
+ ;;
+ "73")
+ printf "%s" "s"
+ ;;
+ "74")
+ printf "%s" "t"
+ ;;
+ "75")
+ printf "%s" "u"
+ ;;
+ "76")
+ printf "%s" "v"
+ ;;
+ "77")
+ printf "%s" "w"
+ ;;
+ "78")
+ printf "%s" "x"
+ ;;
+ "79")
+ printf "%s" "y"
+ ;;
+ "7a")
+ printf "%s" "z"
+ ;;
#numbers
- "30")
- printf "%s" "0"
- ;;
- "31")
- printf "%s" "1"
- ;;
- "32")
- printf "%s" "2"
- ;;
- "33")
- printf "%s" "3"
- ;;
- "34")
- printf "%s" "4"
- ;;
- "35")
- printf "%s" "5"
- ;;
- "36")
- printf "%s" "6"
- ;;
- "37")
- printf "%s" "7"
- ;;
- "38")
- printf "%s" "8"
- ;;
- "39")
- printf "%s" "9"
- ;;
- "2d")
- printf "%s" "-"
- ;;
- "5f")
- printf "%s" "_"
- ;;
- "2e")
- printf "%s" "."
- ;;
- "7e")
- printf "%s" "~"
- ;;
- #other hex
- *)
- printf '%%%s' "$_hex_code"
- ;;
+ "30")
+ printf "%s" "0"
+ ;;
+ "31")
+ printf "%s" "1"
+ ;;
+ "32")
+ printf "%s" "2"
+ ;;
+ "33")
+ printf "%s" "3"
+ ;;
+ "34")
+ printf "%s" "4"
+ ;;
+ "35")
+ printf "%s" "5"
+ ;;
+ "36")
+ printf "%s" "6"
+ ;;
+ "37")
+ printf "%s" "7"
+ ;;
+ "38")
+ printf "%s" "8"
+ ;;
+ "39")
+ printf "%s" "9"
+ ;;
+ "2d")
+ printf "%s" "-"
+ ;;
+ "5f")
+ printf "%s" "_"
+ ;;
+ "2e")
+ printf "%s" "."
+ ;;
+ "7e")
+ printf "%s" "~"
+ ;;
+ #other hex
+ *)
+ printf '%%%s' "$_hex_code"
+ ;;
esac
done
}
@@ -1077,11 +1077,11 @@ _isEccKey() {
return 1
fi
- [ "$_length" != "1024" ] \
- && [ "$_length" != "2048" ] \
- && [ "$_length" != "3072" ] \
- && [ "$_length" != "4096" ] \
- && [ "$_length" != "8192" ]
+ [ "$_length" != "1024" ] &&
+ [ "$_length" != "2048" ] &&
+ [ "$_length" != "3072" ] &&
+ [ "$_length" != "4096" ] &&
+ [ "$_length" != "8192" ]
}
# _createkey 2048|ec-256 file
@@ -1473,7 +1473,7 @@ createDomainKey() {
_initpath "$domain" "$_cdl"
- if [ ! -f "$CERT_KEY_PATH" ] || [ ! -s "$CERT_KEY_PATH" ] || ([ "$FORCE" ] && ! [ "$IS_RENEW" ]) || [ "$Le_ForceNewDomainKey" = "1" ]; then
+ if [ ! -f "$CERT_KEY_PATH" ] || [ ! -s "$CERT_KEY_PATH" ] || ([ "$FORCE" ] && ! [ "$_ACME_IS_RENEW" ]) || [ "$Le_ForceNewDomainKey" = "1" ]; then
if _createkey "$_cdl" "$CERT_KEY_PATH"; then
_savedomainconf Le_Keylength "$_cdl"
_info "The domain key is here: $(__green $CERT_KEY_PATH)"
@@ -1483,7 +1483,7 @@ createDomainKey() {
return 1
fi
else
- if [ "$IS_RENEW" ]; then
+ if [ "$_ACME_IS_RENEW" ]; then
_info "Domain key exists, skip"
return 0
else
@@ -1509,7 +1509,7 @@ createCSR() {
_initpath "$domain" "$_isEcc"
- if [ -f "$CSR_PATH" ] && [ "$IS_RENEW" ] && [ -z "$FORCE" ]; then
+ if [ -f "$CSR_PATH" ] && [ "$_ACME_IS_RENEW" ] && [ -z "$FORCE" ]; then
_info "CSR exists, skip"
return
fi
@@ -1630,22 +1630,22 @@ _calcjwk() {
crv_oid="$(${ACME_OPENSSL_BIN:-openssl} ec -in "$keyfile" -noout -text 2>/dev/null | grep "^ASN1 OID:" | cut -d ":" -f 2 | tr -d " \r\n")"
_debug3 crv_oid "$crv_oid"
case "${crv_oid}" in
- "prime256v1")
- crv="P-256"
- __ECC_KEY_LEN=256
- ;;
- "secp384r1")
- crv="P-384"
- __ECC_KEY_LEN=384
- ;;
- "secp521r1")
- crv="P-521"
- __ECC_KEY_LEN=512
- ;;
- *)
- _err "ECC oid : $crv_oid"
- return 1
- ;;
+ "prime256v1")
+ crv="P-256"
+ __ECC_KEY_LEN=256
+ ;;
+ "secp384r1")
+ crv="P-384"
+ __ECC_KEY_LEN=384
+ ;;
+ "secp521r1")
+ crv="P-521"
+ __ECC_KEY_LEN=512
+ ;;
+ *)
+ _err "ECC oid : $crv_oid"
+ return 1
+ ;;
esac
_debug3 crv "$crv"
fi
@@ -2585,7 +2585,7 @@ _initpath() {
. "$ACCOUNT_CONF_PATH"
fi
- if [ "$ACME_IN_CRON" ]; then
+ if [ "$_ACME_IN_CRON" ]; then
if [ ! "$_USER_PATH_EXPORTED" ]; then
_USER_PATH_EXPORTED=1
export PATH="$USER_PATH:$PATH"
@@ -2599,7 +2599,7 @@ _initpath() {
if [ -z "$ACME_DIRECTORY" ]; then
if [ "$STAGE" ]; then
ACME_DIRECTORY="$DEFAULT_STAGING_CA"
- _info "Using stage ACME_DIRECTORY: $ACME_DIRECTORY"
+ _info "Using ACME_DIRECTORY: $ACME_DIRECTORY"
else
default_acme_server=$(_readaccountconf "DEFAULT_ACME_SERVER")
_debug default_acme_server "$default_acme_server"
@@ -3387,7 +3387,7 @@ _on_issue_err() {
)
fi
- if [ "$IS_RENEW" = "1" ] && _hasfield "$Le_Webroot" "$W_DNS"; then
+ if [ "$_ACME_IS_RENEW" = "1" ] && _hasfield "$Le_Webroot" "$W_DNS"; then
_err "$_DNS_MANUAL_ERR"
fi
@@ -3419,7 +3419,7 @@ _on_issue_success() {
fi
#run renew hook
- if [ "$IS_RENEW" ] && [ "$_chk_renew_hook" ]; then
+ if [ "$_ACME_IS_RENEW" ] && [ "$_chk_renew_hook" ]; then
_info "Run renew hook:'$_chk_renew_hook'"
if ! (
export CERT_PATH
@@ -3990,17 +3990,22 @@ _check_dns_entries() {
}
#file
-_get_cert_issuer() {
+_get_cert_issuers() {
_cfile="$1"
- echo $(openssl x509 -in $_cfile -text -noout | grep 'Issuer:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2)
+ if _contains "$(${ACME_OPENSSL_BIN:-openssl} help crl2pkcs7 2>&1)" "Usage: crl2pkcs7"; then
+ ${ACME_OPENSSL_BIN:-openssl} crl2pkcs7 -nocrl -certfile $_cfile | openssl pkcs7 -print_certs -text -noout | grep 'Issuer:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2
+ else
+ ${ACME_OPENSSL_BIN:-openssl} x509 -in $_cfile -text -noout | grep 'Issuer:' | _egrep_o "CN *=[^,]*" | cut -d = -f 2
+ fi
}
#cert issuer
_match_issuer() {
_cfile="$1"
_missuer="$2"
- _fissuer=$(_get_cert_issuer $_cfile)
- [ "$_missuer" = "$_fissuer" ]
+ _fissuers="$(_get_cert_issuers $_cfile)"
+ _debug2 _fissuers "$_fissuers"
+ _contains "$_fissuers" "$_missuer"
}
#webroot, domain domainlist keylength
@@ -4037,7 +4042,7 @@ issue() {
_challenge_alias="${14}"
_preferred_chain="${15}"
- if [ ! "$IS_RENEW" ]; then
+ if [ -z "$_ACME_IS_RENEW" ]; then
_initpath "$_main_domain" "$_key_length"
mkdir -p "$DOMAIN_PATH"
fi
@@ -4689,7 +4694,8 @@ $_authorizations_map"
der="$(_getfile "${CSR_PATH}" "${BEGIN_CSR}" "${END_CSR}" | tr -d "\r\n" | _url_replace)"
if [ "$ACME_VERSION" = "2" ]; then
- _info "Lets finalize the order, Le_OrderFinalize: $Le_OrderFinalize"
+ _info "Lets finalize the order."
+ _info "Le_OrderFinalize" "$Le_OrderFinalize"
if ! _send_signed_request "${Le_OrderFinalize}" "{\"csr\": \"$der\"}"; then
_err "Sign failed."
_on_issue_err "$_post_hook"
@@ -4760,7 +4766,8 @@ $_authorizations_map"
_on_issue_err "$_post_hook"
return 1
fi
- _info "Downloading cert, Le_LinkCert: $Le_LinkCert"
+ _info "Downloading cert."
+ _info "Le_LinkCert" "$Le_LinkCert"
if ! _send_signed_request "$Le_LinkCert"; then
_err "Sign failed, can not download cert:$Le_LinkCert."
_err "$response"
@@ -4771,10 +4778,8 @@ $_authorizations_map"
echo "$response" >"$CERT_PATH"
_split_cert_chain "$CERT_PATH" "$CERT_FULLCHAIN_PATH" "$CA_CERT_PATH"
- if [ "$_preferred_chain" ]; then
- _cert_issuer=$(_get_cert_issuer "$CA_CERT_PATH")
- _debug _cert_issuer "$_cert_issuer"
- if ! _match_issuer "$CA_CERT_PATH" "$_preferred_chain"; then
+ if [ "$_preferred_chain" ] && [ -f "$CERT_FULLCHAIN_PATH" ]; then
+ if ! _match_issuer "$CERT_FULLCHAIN_PATH" "$_preferred_chain"; then
rels="$(echo "$responseHeaders" | tr -d ' <>' | grep -i "^link:" | grep -i 'rel="alternate"' | cut -d : -f 2- | cut -d ';' -f 1)"
_debug2 "rels" "$rels"
for rel in $rels; do
@@ -4789,7 +4794,7 @@ $_authorizations_map"
_relca="$CA_CERT_PATH.alt"
echo "$response" >"$_relcert"
_split_cert_chain "$_relcert" "$_relfullchain" "$_relca"
- if _match_issuer "$_relca" "$_preferred_chain"; then
+ if _match_issuer "$_relfullchain" "$_preferred_chain"; then
_info "Matched issuer in: $rel"
cat $_relcert >"$CERT_PATH"
cat $_relfullchain >"$CERT_FULLCHAIN_PATH"
@@ -4842,7 +4847,7 @@ $_authorizations_map"
_info "Your cert key is in $(__green " $CERT_KEY_PATH ")"
fi
- if [ ! "$USER_PATH" ] || [ ! "$ACME_IN_CRON" ]; then
+ if [ ! "$USER_PATH" ] || [ ! "$_ACME_IN_CRON" ]; then
USER_PATH="$PATH"
_saveaccountconf "USER_PATH" "$USER_PATH"
fi
@@ -5033,12 +5038,12 @@ renew() {
return "$RENEW_SKIP"
fi
- if [ "$ACME_IN_CRON" = "1" ] && [ -z "$Le_CertCreateTime" ]; then
+ if [ "$_ACME_IN_CRON" = "1" ] && [ -z "$Le_CertCreateTime" ]; then
_info "Skip invalid cert for: $Le_Domain"
return $RENEW_SKIP
fi
- IS_RENEW="1"
+ _ACME_IS_RENEW="1"
Le_ReloadCmd="$(_readdomainconf Le_ReloadCmd)"
Le_PreHook="$(_readdomainconf Le_PreHook)"
Le_PostHook="$(_readdomainconf Le_PostHook)"
@@ -5054,7 +5059,7 @@ renew() {
res="$?"
fi
- IS_RENEW=""
+ _ACME_IS_RENEW=""
return "$res"
}
@@ -5094,7 +5099,7 @@ renewAll() {
_error_level="$NOTIFY_LEVEL_RENEW"
_notify_code=0
fi
- if [ "$ACME_IN_CRON" ]; then
+ if [ "$_ACME_IN_CRON" ]; then
if [ $_set_level -ge $NOTIFY_LEVEL_RENEW ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
_send_notify "Renew $d success" "Good, the cert is renewed." "$NOTIFY_HOOK" 0
@@ -5108,7 +5113,7 @@ renewAll() {
_error_level="$NOTIFY_LEVEL_SKIP"
_notify_code=$RENEW_SKIP
fi
- if [ "$ACME_IN_CRON" ]; then
+ if [ "$_ACME_IN_CRON" ]; then
if [ $_set_level -ge $NOTIFY_LEVEL_SKIP ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
_send_notify "Renew $d skipped" "Good, the cert is skipped." "$NOTIFY_HOOK" "$RENEW_SKIP"
@@ -5123,7 +5128,7 @@ renewAll() {
_error_level="$NOTIFY_LEVEL_ERROR"
_notify_code=1
fi
- if [ "$ACME_IN_CRON" ]; then
+ if [ "$_ACME_IN_CRON" ]; then
if [ $_set_level -ge $NOTIFY_LEVEL_ERROR ]; then
if [ "$NOTIFY_MODE" = "$NOTIFY_MODE_CERT" ]; then
_send_notify "Renew $d error" "There is an error." "$NOTIFY_HOOK" 1
@@ -5144,7 +5149,7 @@ renewAll() {
done
_debug _error_level "$_error_level"
_debug _set_level "$_set_level"
- if [ "$ACME_IN_CRON" ] && [ $_error_level -le $_set_level ]; then
+ if [ "$_ACME_IN_CRON" ] && [ $_error_level -le $_set_level ]; then
if [ -z "$NOTIFY_MODE" ] || [ "$NOTIFY_MODE" = "$NOTIFY_MODE_BULK" ]; then
_msg_subject="Renew"
if [ "$_error_msg" ]; then
@@ -5442,7 +5447,7 @@ _installcert() {
if [ "$_real_cert" ]; then
_info "Installing cert to:$_real_cert"
- if [ -f "$_real_cert" ] && [ ! "$IS_RENEW" ]; then
+ if [ -f "$_real_cert" ] && [ ! "$_ACME_IS_RENEW" ]; then
cp "$_real_cert" "$_backup_path/cert.bak"
fi
cat "$CERT_PATH" >"$_real_cert" || return 1
@@ -5454,7 +5459,7 @@ _installcert() {
echo "" >>"$_real_ca"
cat "$CA_CERT_PATH" >>"$_real_ca" || return 1
else
- if [ -f "$_real_ca" ] && [ ! "$IS_RENEW" ]; then
+ if [ -f "$_real_ca" ] && [ ! "$_ACME_IS_RENEW" ]; then
cp "$_real_ca" "$_backup_path/ca.bak"
fi
cat "$CA_CERT_PATH" >"$_real_ca" || return 1
@@ -5463,7 +5468,7 @@ _installcert() {
if [ "$_real_key" ]; then
_info "Installing key to:$_real_key"
- if [ -f "$_real_key" ] && [ ! "$IS_RENEW" ]; then
+ if [ -f "$_real_key" ] && [ ! "$_ACME_IS_RENEW" ]; then
cp "$_real_key" "$_backup_path/key.bak"
fi
if [ -f "$_real_key" ]; then
@@ -5476,7 +5481,7 @@ _installcert() {
if [ "$_real_fullchain" ]; then
_info "Installing full chain to:$_real_fullchain"
- if [ -f "$_real_fullchain" ] && [ ! "$IS_RENEW" ]; then
+ if [ -f "$_real_fullchain" ] && [ ! "$_ACME_IS_RENEW" ]; then
cp "$_real_fullchain" "$_backup_path/fullchain.bak"
fi
cat "$CERT_FULLCHAIN_PATH" >"$_real_fullchain" || return 1
@@ -6093,7 +6098,7 @@ install() {
_debug "Skip install cron job"
fi
- if [ "$ACME_IN_CRON" != "1" ]; then
+ if [ "$_ACME_IN_CRON" != "1" ]; then
if ! _precheck "$_nocron"; then
_err "Pre-check failed, can not install."
return 1
@@ -6150,7 +6155,7 @@ install() {
_info "Installed to $LE_WORKING_DIR/$PROJECT_ENTRY"
- if [ "$ACME_IN_CRON" != "1" ] && [ -z "$_noprofile" ]; then
+ if [ "$_ACME_IN_CRON" != "1" ] && [ -z "$_noprofile" ]; then
_installalias "$_c_home"
fi
@@ -6248,7 +6253,7 @@ _uninstallalias() {
}
cron() {
- export ACME_IN_CRON=1
+ export _ACME_IN_CRON=1
_initpath
_info "$(__green "===Starting cron===")"
if [ "$AUTO_UPGRADE" = "1" ]; then
@@ -6269,7 +6274,7 @@ cron() {
fi
renewAll
_ret="$?"
- ACME_IN_CRON=""
+ _ACME_IN_CRON=""
_info "$(__green "===End cron===")"
exit $_ret
}
@@ -6767,501 +6772,501 @@ _process() {
while [ ${#} -gt 0 ]; do
case "${1}" in
- --help | -h)
- showhelp
- return
- ;;
- --version | -v)
- version
- return
- ;;
- --install)
- _CMD="install"
- ;;
- --uninstall)
- _CMD="uninstall"
- ;;
- --upgrade)
- _CMD="upgrade"
- ;;
- --issue)
- _CMD="issue"
- ;;
- --deploy)
- _CMD="deploy"
- ;;
- --signcsr)
- _CMD="signcsr"
- ;;
- --showcsr)
- _CMD="showcsr"
- ;;
- --installcert | -i | --install-cert)
- _CMD="installcert"
- ;;
- --renew | -r)
- _CMD="renew"
- ;;
- --renewAll | --renewall | --renew-all)
- _CMD="renewAll"
- ;;
- --revoke)
- _CMD="revoke"
- ;;
- --remove)
- _CMD="remove"
- ;;
- --list)
- _CMD="list"
- ;;
- --installcronjob | --install-cronjob)
- _CMD="installcronjob"
- ;;
- --uninstallcronjob | --uninstall-cronjob)
- _CMD="uninstallcronjob"
- ;;
- --cron)
- _CMD="cron"
- ;;
- --toPkcs)
- _CMD="toPkcs"
- ;;
- --toPkcs8)
- _CMD="toPkcs8"
- ;;
- --createAccountKey | --createaccountkey | -cak | --create-account-key)
- _CMD="createAccountKey"
- ;;
- --createDomainKey | --createdomainkey | -cdk | --create-domain-key)
- _CMD="createDomainKey"
- ;;
- --createCSR | --createcsr | -ccr)
- _CMD="createCSR"
- ;;
- --deactivate)
- _CMD="deactivate"
- ;;
- --updateaccount | --update-account)
- _CMD="updateaccount"
- ;;
- --registeraccount | --register-account)
- _CMD="registeraccount"
- ;;
- --deactivate-account)
- _CMD="deactivateaccount"
- ;;
- --set-notify)
- _CMD="setnotify"
- ;;
- --set-default-ca)
- _CMD="setdefaultca"
- ;;
- --domain | -d)
- _dvalue="$2"
+ --help | -h)
+ showhelp
+ return
+ ;;
+ --version | -v)
+ version
+ return
+ ;;
+ --install)
+ _CMD="install"
+ ;;
+ --uninstall)
+ _CMD="uninstall"
+ ;;
+ --upgrade)
+ _CMD="upgrade"
+ ;;
+ --issue)
+ _CMD="issue"
+ ;;
+ --deploy)
+ _CMD="deploy"
+ ;;
+ --signcsr)
+ _CMD="signcsr"
+ ;;
+ --showcsr)
+ _CMD="showcsr"
+ ;;
+ --installcert | -i | --install-cert)
+ _CMD="installcert"
+ ;;
+ --renew | -r)
+ _CMD="renew"
+ ;;
+ --renewAll | --renewall | --renew-all)
+ _CMD="renewAll"
+ ;;
+ --revoke)
+ _CMD="revoke"
+ ;;
+ --remove)
+ _CMD="remove"
+ ;;
+ --list)
+ _CMD="list"
+ ;;
+ --installcronjob | --install-cronjob)
+ _CMD="installcronjob"
+ ;;
+ --uninstallcronjob | --uninstall-cronjob)
+ _CMD="uninstallcronjob"
+ ;;
+ --cron)
+ _CMD="cron"
+ ;;
+ --toPkcs)
+ _CMD="toPkcs"
+ ;;
+ --toPkcs8)
+ _CMD="toPkcs8"
+ ;;
+ --createAccountKey | --createaccountkey | -cak | --create-account-key)
+ _CMD="createAccountKey"
+ ;;
+ --createDomainKey | --createdomainkey | -cdk | --create-domain-key)
+ _CMD="createDomainKey"
+ ;;
+ --createCSR | --createcsr | -ccr)
+ _CMD="createCSR"
+ ;;
+ --deactivate)
+ _CMD="deactivate"
+ ;;
+ --updateaccount | --update-account)
+ _CMD="updateaccount"
+ ;;
+ --registeraccount | --register-account)
+ _CMD="registeraccount"
+ ;;
+ --deactivate-account)
+ _CMD="deactivateaccount"
+ ;;
+ --set-notify)
+ _CMD="setnotify"
+ ;;
+ --set-default-ca)
+ _CMD="setdefaultca"
+ ;;
+ --domain | -d)
+ _dvalue="$2"
- if [ "$_dvalue" ]; then
- if _startswith "$_dvalue" "-"; then
- _err "'$_dvalue' is not a valid domain for parameter '$1'"
- return 1
- fi
- if _is_idn "$_dvalue" && ! _exists idn; then
- _err "It seems that $_dvalue is an IDN( Internationalized Domain Names), please install 'idn' command first."
- return 1
- fi
+ if [ "$_dvalue" ]; then
+ if _startswith "$_dvalue" "-"; then
+ _err "'$_dvalue' is not a valid domain for parameter '$1'"
+ return 1
+ fi
+ if _is_idn "$_dvalue" && ! _exists idn; then
+ _err "It seems that $_dvalue is an IDN( Internationalized Domain Names), please install 'idn' command first."
+ return 1
+ fi
- if _startswith "$_dvalue" "*."; then
- _debug "Wildcard domain"
- export ACME_VERSION=2
- fi
- if [ -z "$_domain" ]; then
- _domain="$_dvalue"
+ if _startswith "$_dvalue" "*."; then
+ _debug "Wildcard domain"
+ export ACME_VERSION=2
+ fi
+ if [ -z "$_domain" ]; then
+ _domain="$_dvalue"
+ else
+ if [ "$_altdomains" = "$NO_VALUE" ]; then
+ _altdomains="$_dvalue"
else
- if [ "$_altdomains" = "$NO_VALUE" ]; then
- _altdomains="$_dvalue"
- else
- _altdomains="$_altdomains,$_dvalue"
- fi
+ _altdomains="$_altdomains,$_dvalue"
fi
fi
+ fi
- shift
- ;;
+ shift
+ ;;
- --force | -f)
- FORCE="1"
- ;;
- --staging | --test)
- STAGE="1"
- ;;
- --server)
- _server="$2"
- _selectServer "$_server"
+ --force | -f)
+ FORCE="1"
+ ;;
+ --staging | --test)
+ STAGE="1"
+ ;;
+ --server)
+ _server="$2"
+ _selectServer "$_server"
+ shift
+ ;;
+ --debug)
+ if [ -z "$2" ] || _startswith "$2" "-"; then
+ DEBUG="$DEBUG_LEVEL_DEFAULT"
+ else
+ DEBUG="$2"
shift
- ;;
- --debug)
- if [ -z "$2" ] || _startswith "$2" "-"; then
- DEBUG="$DEBUG_LEVEL_DEFAULT"
- else
- DEBUG="$2"
- shift
- fi
- ;;
- --output-insecure)
- export OUTPUT_INSECURE=1
- ;;
- --webroot | -w)
+ fi
+ ;;
+ --output-insecure)
+ export OUTPUT_INSECURE=1
+ ;;
+ --webroot | -w)
+ wvalue="$2"
+ if [ -z "$_webroot" ]; then
+ _webroot="$wvalue"
+ else
+ _webroot="$_webroot,$wvalue"
+ 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
+ _webroot="$wvalue"
+ else
+ _webroot="$_webroot,$wvalue"
+ fi
+ ;;
+ --alpn)
+ wvalue="$W_ALPN"
+ if [ -z "$_webroot" ]; then
+ _webroot="$wvalue"
+ else
+ _webroot="$_webroot,$wvalue"
+ fi
+ ;;
+ --stateless)
+ wvalue="$MODE_STATELESS"
+ if [ -z "$_webroot" ]; then
+ _webroot="$wvalue"
+ else
+ _webroot="$_webroot,$wvalue"
+ fi
+ ;;
+ --local-address)
+ lvalue="$2"
+ _local_address="$_local_address$lvalue,"
+ shift
+ ;;
+ --apache)
+ wvalue="apache"
+ if [ -z "$_webroot" ]; then
+ _webroot="$wvalue"
+ else
+ _webroot="$_webroot,$wvalue"
+ fi
+ ;;
+ --nginx)
+ wvalue="$NGINX"
+ if [ "$2" ] && ! _startswith "$2" "-"; then
+ wvalue="$NGINX$2"
+ shift
+ fi
+ if [ -z "$_webroot" ]; then
+ _webroot="$wvalue"
+ else
+ _webroot="$_webroot,$wvalue"
+ fi
+ ;;
+ --dns)
+ wvalue="$W_DNS"
+ if [ "$2" ] && ! _startswith "$2" "-"; then
wvalue="$2"
- if [ -z "$_webroot" ]; then
- _webroot="$wvalue"
- else
- _webroot="$_webroot,$wvalue"
- 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
- _webroot="$wvalue"
- else
- _webroot="$_webroot,$wvalue"
- fi
- ;;
- --alpn)
- wvalue="$W_ALPN"
- if [ -z "$_webroot" ]; then
- _webroot="$wvalue"
- else
- _webroot="$_webroot,$wvalue"
- fi
- ;;
- --stateless)
- wvalue="$MODE_STATELESS"
- if [ -z "$_webroot" ]; then
- _webroot="$wvalue"
- else
- _webroot="$_webroot,$wvalue"
- fi
- ;;
- --local-address)
- lvalue="$2"
- _local_address="$_local_address$lvalue,"
- shift
- ;;
- --apache)
- wvalue="apache"
- if [ -z "$_webroot" ]; then
- _webroot="$wvalue"
- else
- _webroot="$_webroot,$wvalue"
- fi
- ;;
- --nginx)
- wvalue="$NGINX"
- if [ "$2" ] && ! _startswith "$2" "-"; then
- wvalue="$NGINX$2"
- shift
- fi
- if [ -z "$_webroot" ]; then
- _webroot="$wvalue"
- else
- _webroot="$_webroot,$wvalue"
- fi
- ;;
- --dns)
- wvalue="$W_DNS"
- if [ "$2" ] && ! _startswith "$2" "-"; then
- wvalue="$2"
- shift
- fi
- if [ -z "$_webroot" ]; then
- _webroot="$wvalue"
- else
- _webroot="$_webroot,$wvalue"
- fi
- ;;
- --dnssleep)
- _dnssleep="$2"
- Le_DNSSleep="$_dnssleep"
- shift
- ;;
+ fi
+ if [ -z "$_webroot" ]; then
+ _webroot="$wvalue"
+ else
+ _webroot="$_webroot,$wvalue"
+ fi
+ ;;
+ --dnssleep)
+ _dnssleep="$2"
+ Le_DNSSleep="$_dnssleep"
+ shift
+ ;;
- --keylength | -k)
- _keylength="$2"
- shift
- ;;
- --accountkeylength | -ak)
- _accountkeylength="$2"
- shift
- ;;
+ --keylength | -k)
+ _keylength="$2"
+ shift
+ ;;
+ --accountkeylength | -ak)
+ _accountkeylength="$2"
+ shift
+ ;;
- --cert-file | --certpath)
- _cert_file="$2"
- shift
- ;;
- --key-file | --keypath)
- _key_file="$2"
- shift
- ;;
- --ca-file | --capath)
- _ca_file="$2"
- shift
- ;;
- --fullchain-file | --fullchainpath)
- _fullchain_file="$2"
- shift
- ;;
- --reloadcmd | --reloadCmd)
- _reloadcmd="$2"
- shift
- ;;
- --password)
- _password="$2"
- shift
- ;;
- --accountconf)
- _accountconf="$2"
- ACCOUNT_CONF_PATH="$_accountconf"
- shift
- ;;
- --home)
- LE_WORKING_DIR="$2"
- shift
- ;;
- --certhome | --cert-home)
- _certhome="$2"
- CERT_HOME="$_certhome"
- shift
- ;;
- --config-home)
- _confighome="$2"
- LE_CONFIG_HOME="$_confighome"
- shift
- ;;
- --useragent)
- _useragent="$2"
- USER_AGENT="$_useragent"
- shift
- ;;
- --accountemail | -m)
- _accountemail="$2"
- ACCOUNT_EMAIL="$_accountemail"
- shift
- ;;
- --accountkey)
- _accountkey="$2"
- ACCOUNT_KEY_PATH="$_accountkey"
- shift
- ;;
- --days)
- _days="$2"
- Le_RenewalDays="$_days"
- shift
- ;;
- --httpport)
- _httpport="$2"
- Le_HTTPPort="$_httpport"
- shift
- ;;
- --tlsport)
- _tlsport="$2"
- Le_TLSPort="$_tlsport"
- shift
- ;;
- --listraw)
- _listraw="raw"
- ;;
- --stopRenewOnError | --stoprenewonerror | -se)
- _stopRenewOnError="1"
- ;;
- --insecure)
- #_insecure="1"
- HTTPS_INSECURE="1"
- ;;
- --ca-bundle)
- _ca_bundle="$(_readlink "$2")"
- CA_BUNDLE="$_ca_bundle"
- shift
- ;;
- --ca-path)
- _ca_path="$2"
- CA_PATH="$_ca_path"
- shift
- ;;
- --nocron)
- _nocron="1"
- ;;
- --noprofile)
- _noprofile="1"
- ;;
- --no-color)
- export ACME_NO_COLOR=1
- ;;
- --force-color)
- export ACME_FORCE_COLOR=1
- ;;
- --ecc)
- _ecc="isEcc"
- ;;
- --csr)
- _csr="$2"
- shift
- ;;
- --pre-hook)
- _pre_hook="$2"
- shift
- ;;
- --post-hook)
- _post_hook="$2"
- shift
- ;;
- --renew-hook)
- _renew_hook="$2"
- shift
- ;;
- --deploy-hook)
- if [ -z "$2" ] || _startswith "$2" "-"; then
- _usage "Please specify a value for '--deploy-hook'"
- return 1
- fi
- _deploy_hook="$_deploy_hook$2,"
- shift
- ;;
- --ocsp-must-staple | --ocsp)
- Le_OCSP_Staple="1"
- ;;
- --always-force-new-domain-key)
- if [ -z "$2" ] || _startswith "$2" "-"; then
- Le_ForceNewDomainKey=1
- else
- Le_ForceNewDomainKey="$2"
- shift
- fi
- ;;
- --yes-I-know-dns-manual-mode-enough-go-ahead-please)
- export FORCE_DNS_MANUAL=1
- ;;
- --log | --logfile)
- _log="1"
- _logfile="$2"
- if _startswith "$_logfile" '-'; then
- _logfile=""
- else
- shift
- fi
- LOG_FILE="$_logfile"
- if [ -z "$LOG_LEVEL" ]; then
- LOG_LEVEL="$DEFAULT_LOG_LEVEL"
- fi
- ;;
- --log-level)
- _log_level="$2"
- LOG_LEVEL="$_log_level"
- shift
- ;;
- --syslog)
- if ! _startswith "$2" '-'; then
- _syslog="$2"
- shift
- fi
- if [ -z "$_syslog" ]; then
- _syslog="$SYSLOG_LEVEL_DEFAULT"
- fi
- ;;
- --auto-upgrade)
- _auto_upgrade="$2"
- if [ -z "$_auto_upgrade" ] || _startswith "$_auto_upgrade" '-'; then
- _auto_upgrade="1"
- else
- shift
- fi
- AUTO_UPGRADE="$_auto_upgrade"
- ;;
- --listen-v4)
- _listen_v4="1"
- Le_Listen_V4="$_listen_v4"
- ;;
- --listen-v6)
- _listen_v6="1"
- Le_Listen_V6="$_listen_v6"
- ;;
- --openssl-bin)
- _openssl_bin="$2"
- ACME_OPENSSL_BIN="$_openssl_bin"
- shift
- ;;
- --use-wget)
- _use_wget="1"
- ACME_USE_WGET="1"
- ;;
- --branch | -b)
- export BRANCH="$2"
- shift
- ;;
- --notify-hook)
- _nhook="$2"
- if _startswith "$_nhook" "-"; then
- _err "'$_nhook' is not a hook name for '$1'"
- return 1
- fi
- if [ "$_notify_hook" ]; then
- _notify_hook="$_notify_hook,$_nhook"
- else
- _notify_hook="$_nhook"
- fi
- shift
- ;;
- --notify-level)
- _nlevel="$2"
- if _startswith "$_nlevel" "-"; then
- _err "'$_nlevel' is not a integer for '$1'"
- return 1
- fi
- _notify_level="$_nlevel"
- shift
- ;;
- --notify-mode)
- _nmode="$2"
- if _startswith "$_nmode" "-"; then
- _err "'$_nmode' is not a integer for '$1'"
- return 1
- fi
- _notify_mode="$_nmode"
- shift
- ;;
- --revoke-reason)
- _revoke_reason="$2"
- if _startswith "$_revoke_reason" "-"; then
- _err "'$_revoke_reason' is not a integer for '$1'"
- return 1
- fi
- shift
- ;;
- --eab-kid)
- _eab_kid="$2"
- shift
- ;;
- --eab-hmac-key)
- _eab_hmac_key="$2"
- shift
- ;;
- --preferred-chain)
- _preferred_chain="$2"
- shift
- ;;
- *)
- _err "Unknown parameter : $1"
+ --cert-file | --certpath)
+ _cert_file="$2"
+ shift
+ ;;
+ --key-file | --keypath)
+ _key_file="$2"
+ shift
+ ;;
+ --ca-file | --capath)
+ _ca_file="$2"
+ shift
+ ;;
+ --fullchain-file | --fullchainpath)
+ _fullchain_file="$2"
+ shift
+ ;;
+ --reloadcmd | --reloadCmd)
+ _reloadcmd="$2"
+ shift
+ ;;
+ --password)
+ _password="$2"
+ shift
+ ;;
+ --accountconf)
+ _accountconf="$2"
+ ACCOUNT_CONF_PATH="$_accountconf"
+ shift
+ ;;
+ --home)
+ LE_WORKING_DIR="$2"
+ shift
+ ;;
+ --certhome | --cert-home)
+ _certhome="$2"
+ CERT_HOME="$_certhome"
+ shift
+ ;;
+ --config-home)
+ _confighome="$2"
+ LE_CONFIG_HOME="$_confighome"
+ shift
+ ;;
+ --useragent)
+ _useragent="$2"
+ USER_AGENT="$_useragent"
+ shift
+ ;;
+ --accountemail | -m)
+ _accountemail="$2"
+ ACCOUNT_EMAIL="$_accountemail"
+ shift
+ ;;
+ --accountkey)
+ _accountkey="$2"
+ ACCOUNT_KEY_PATH="$_accountkey"
+ shift
+ ;;
+ --days)
+ _days="$2"
+ Le_RenewalDays="$_days"
+ shift
+ ;;
+ --httpport)
+ _httpport="$2"
+ Le_HTTPPort="$_httpport"
+ shift
+ ;;
+ --tlsport)
+ _tlsport="$2"
+ Le_TLSPort="$_tlsport"
+ shift
+ ;;
+ --listraw)
+ _listraw="raw"
+ ;;
+ --stopRenewOnError | --stoprenewonerror | -se)
+ _stopRenewOnError="1"
+ ;;
+ --insecure)
+ #_insecure="1"
+ HTTPS_INSECURE="1"
+ ;;
+ --ca-bundle)
+ _ca_bundle="$(_readlink "$2")"
+ CA_BUNDLE="$_ca_bundle"
+ shift
+ ;;
+ --ca-path)
+ _ca_path="$2"
+ CA_PATH="$_ca_path"
+ shift
+ ;;
+ --nocron)
+ _nocron="1"
+ ;;
+ --noprofile)
+ _noprofile="1"
+ ;;
+ --no-color)
+ export ACME_NO_COLOR=1
+ ;;
+ --force-color)
+ export ACME_FORCE_COLOR=1
+ ;;
+ --ecc)
+ _ecc="isEcc"
+ ;;
+ --csr)
+ _csr="$2"
+ shift
+ ;;
+ --pre-hook)
+ _pre_hook="$2"
+ shift
+ ;;
+ --post-hook)
+ _post_hook="$2"
+ shift
+ ;;
+ --renew-hook)
+ _renew_hook="$2"
+ shift
+ ;;
+ --deploy-hook)
+ if [ -z "$2" ] || _startswith "$2" "-"; then
+ _usage "Please specify a value for '--deploy-hook'"
return 1
- ;;
+ fi
+ _deploy_hook="$_deploy_hook$2,"
+ shift
+ ;;
+ --ocsp-must-staple | --ocsp)
+ Le_OCSP_Staple="1"
+ ;;
+ --always-force-new-domain-key)
+ if [ -z "$2" ] || _startswith "$2" "-"; then
+ Le_ForceNewDomainKey=1
+ else
+ Le_ForceNewDomainKey="$2"
+ shift
+ fi
+ ;;
+ --yes-I-know-dns-manual-mode-enough-go-ahead-please)
+ export FORCE_DNS_MANUAL=1
+ ;;
+ --log | --logfile)
+ _log="1"
+ _logfile="$2"
+ if _startswith "$_logfile" '-'; then
+ _logfile=""
+ else
+ shift
+ fi
+ LOG_FILE="$_logfile"
+ if [ -z "$LOG_LEVEL" ]; then
+ LOG_LEVEL="$DEFAULT_LOG_LEVEL"
+ fi
+ ;;
+ --log-level)
+ _log_level="$2"
+ LOG_LEVEL="$_log_level"
+ shift
+ ;;
+ --syslog)
+ if ! _startswith "$2" '-'; then
+ _syslog="$2"
+ shift
+ fi
+ if [ -z "$_syslog" ]; then
+ _syslog="$SYSLOG_LEVEL_DEFAULT"
+ fi
+ ;;
+ --auto-upgrade)
+ _auto_upgrade="$2"
+ if [ -z "$_auto_upgrade" ] || _startswith "$_auto_upgrade" '-'; then
+ _auto_upgrade="1"
+ else
+ shift
+ fi
+ AUTO_UPGRADE="$_auto_upgrade"
+ ;;
+ --listen-v4)
+ _listen_v4="1"
+ Le_Listen_V4="$_listen_v4"
+ ;;
+ --listen-v6)
+ _listen_v6="1"
+ Le_Listen_V6="$_listen_v6"
+ ;;
+ --openssl-bin)
+ _openssl_bin="$2"
+ ACME_OPENSSL_BIN="$_openssl_bin"
+ shift
+ ;;
+ --use-wget)
+ _use_wget="1"
+ ACME_USE_WGET="1"
+ ;;
+ --branch | -b)
+ export BRANCH="$2"
+ shift
+ ;;
+ --notify-hook)
+ _nhook="$2"
+ if _startswith "$_nhook" "-"; then
+ _err "'$_nhook' is not a hook name for '$1'"
+ return 1
+ fi
+ if [ "$_notify_hook" ]; then
+ _notify_hook="$_notify_hook,$_nhook"
+ else
+ _notify_hook="$_nhook"
+ fi
+ shift
+ ;;
+ --notify-level)
+ _nlevel="$2"
+ if _startswith "$_nlevel" "-"; then
+ _err "'$_nlevel' is not a integer for '$1'"
+ return 1
+ fi
+ _notify_level="$_nlevel"
+ shift
+ ;;
+ --notify-mode)
+ _nmode="$2"
+ if _startswith "$_nmode" "-"; then
+ _err "'$_nmode' is not a integer for '$1'"
+ return 1
+ fi
+ _notify_mode="$_nmode"
+ shift
+ ;;
+ --revoke-reason)
+ _revoke_reason="$2"
+ if _startswith "$_revoke_reason" "-"; then
+ _err "'$_revoke_reason' is not a integer for '$1'"
+ return 1
+ fi
+ shift
+ ;;
+ --eab-kid)
+ _eab_kid="$2"
+ shift
+ ;;
+ --eab-hmac-key)
+ _eab_hmac_key="$2"
+ shift
+ ;;
+ --preferred-chain)
+ _preferred_chain="$2"
+ shift
+ ;;
+ *)
+ _err "Unknown parameter : $1"
+ return 1
+ ;;
esac
shift 1
@@ -7320,82 +7325,82 @@ _process() {
fi
_debug "Running cmd: ${_CMD}"
case "${_CMD}" in
- install) install "$_nocron" "$_confighome" "$_noprofile" ;;
- 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" "$_challenge_alias" "$_preferred_chain"
- ;;
- deploy)
- deploy "$_domain" "$_deploy_hook" "$_ecc"
- ;;
- signcsr)
- 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"
- ;;
- installcert)
- installcert "$_domain" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_ecc"
- ;;
- renew)
- renew "$_domain" "$_ecc"
- ;;
- renewAll)
- renewAll "$_stopRenewOnError"
- ;;
- revoke)
- revoke "$_domain" "$_ecc" "$_revoke_reason"
- ;;
- remove)
- remove "$_domain" "$_ecc"
- ;;
- deactivate)
- deactivate "$_domain,$_altdomains"
- ;;
- registeraccount)
- registeraccount "$_accountkeylength" "$_eab_kid" "$_eab_hmac_key"
- ;;
- updateaccount)
- updateaccount
- ;;
- deactivateaccount)
- deactivateaccount
- ;;
- list)
- list "$_listraw" "$_domain"
- ;;
- installcronjob) installcronjob "$_confighome" ;;
- uninstallcronjob) uninstallcronjob ;;
- cron) cron ;;
- toPkcs)
- toPkcs "$_domain" "$_password" "$_ecc"
- ;;
- toPkcs8)
- toPkcs8 "$_domain" "$_ecc"
- ;;
- createAccountKey)
- createAccountKey "$_accountkeylength"
- ;;
- createDomainKey)
- createDomainKey "$_domain" "$_keylength"
- ;;
- createCSR)
- createCSR "$_domain" "$_altdomains" "$_ecc"
- ;;
- setnotify)
- setnotify "$_notify_hook" "$_notify_level" "$_notify_mode"
- ;;
- setdefaultca)
- setdefaultca
- ;;
- *)
- if [ "$_CMD" ]; then
- _err "Invalid command: $_CMD"
- fi
- showhelp
- return 1
- ;;
+ install) install "$_nocron" "$_confighome" "$_noprofile" ;;
+ 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" "$_challenge_alias" "$_preferred_chain"
+ ;;
+ deploy)
+ deploy "$_domain" "$_deploy_hook" "$_ecc"
+ ;;
+ signcsr)
+ 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"
+ ;;
+ installcert)
+ installcert "$_domain" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_ecc"
+ ;;
+ renew)
+ renew "$_domain" "$_ecc"
+ ;;
+ renewAll)
+ renewAll "$_stopRenewOnError"
+ ;;
+ revoke)
+ revoke "$_domain" "$_ecc" "$_revoke_reason"
+ ;;
+ remove)
+ remove "$_domain" "$_ecc"
+ ;;
+ deactivate)
+ deactivate "$_domain,$_altdomains"
+ ;;
+ registeraccount)
+ registeraccount "$_accountkeylength" "$_eab_kid" "$_eab_hmac_key"
+ ;;
+ updateaccount)
+ updateaccount
+ ;;
+ deactivateaccount)
+ deactivateaccount
+ ;;
+ list)
+ list "$_listraw" "$_domain"
+ ;;
+ installcronjob) installcronjob "$_confighome" ;;
+ uninstallcronjob) uninstallcronjob ;;
+ cron) cron ;;
+ toPkcs)
+ toPkcs "$_domain" "$_password" "$_ecc"
+ ;;
+ toPkcs8)
+ toPkcs8 "$_domain" "$_ecc"
+ ;;
+ createAccountKey)
+ createAccountKey "$_accountkeylength"
+ ;;
+ createDomainKey)
+ createDomainKey "$_domain" "$_keylength"
+ ;;
+ createCSR)
+ createCSR "$_domain" "$_altdomains" "$_ecc"
+ ;;
+ setnotify)
+ setnotify "$_notify_hook" "$_notify_level" "$_notify_mode"
+ ;;
+ setdefaultca)
+ setdefaultca
+ ;;
+ *)
+ if [ "$_CMD" ]; then
+ _err "Invalid command: $_CMD"
+ fi
+ showhelp
+ return 1
+ ;;
esac
_ret="$?"
if [ "$_ret" != "0" ]; then
diff --git a/deploy/exim4.sh b/deploy/exim4.sh
index 573f762b..260b8798 100644
--- a/deploy/exim4.sh
+++ b/deploy/exim4.sh
@@ -69,8 +69,8 @@ exim4_deploy() {
cp "$_exim4_conf" "$_backup_conf"
_info "Modify exim4 conf: $_exim4_conf"
- if _setopt "$_exim4_conf" "tls_certificate" "=" "$_real_fullchain" \
- && _setopt "$_exim4_conf" "tls_privatekey" "=" "$_real_key"; then
+ if _setopt "$_exim4_conf" "tls_certificate" "=" "$_real_fullchain" &&
+ _setopt "$_exim4_conf" "tls_privatekey" "=" "$_real_key"; then
_info "Set config success!"
else
_err "Config exim4 server error, please report bug to us."
diff --git a/deploy/ssh.sh b/deploy/ssh.sh
index 06d4b2b4..18de4aa6 100644
--- a/deploy/ssh.sh
+++ b/deploy/ssh.sh
@@ -195,8 +195,8 @@ then rm -rf \"\$fn\"; echo \"Backup \$fn deleted as older than 180 days\"; fi; d
fi
if [ -n "$Le_Deploy_ssh_cafile" ]; then
_pipe=">"
- if [ "$Le_Deploy_ssh_cafile" = "$Le_Deploy_ssh_keyfile" ] \
- || [ "$Le_Deploy_ssh_cafile" = "$Le_Deploy_ssh_certfile" ]; then
+ if [ "$Le_Deploy_ssh_cafile" = "$Le_Deploy_ssh_keyfile" ] ||
+ [ "$Le_Deploy_ssh_cafile" = "$Le_Deploy_ssh_certfile" ]; then
# if filename is same as previous file then append.
_pipe=">>"
elif [ "$Le_Deploy_ssh_backup" = "yes" ]; then
@@ -222,9 +222,9 @@ then rm -rf \"\$fn\"; echo \"Backup \$fn deleted as older than 180 days\"; fi; d
fi
if [ -n "$Le_Deploy_ssh_fullchain" ]; then
_pipe=">"
- if [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_keyfile" ] \
- || [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_certfile" ] \
- || [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_cafile" ]; then
+ if [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_keyfile" ] ||
+ [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_certfile" ] ||
+ [ "$Le_Deploy_ssh_fullchain" = "$Le_Deploy_ssh_cafile" ]; then
# if filename is same as previous file then append.
_pipe=">>"
elif [ "$Le_Deploy_ssh_backup" = "yes" ]; then
diff --git a/deploy/vsftpd.sh b/deploy/vsftpd.sh
index ed44e709..8cf24e4f 100644
--- a/deploy/vsftpd.sh
+++ b/deploy/vsftpd.sh
@@ -65,9 +65,9 @@ vsftpd_deploy() {
cp "$_vsftpd_conf" "$_backup_conf"
_info "Modify vsftpd conf: $_vsftpd_conf"
- if _setopt "$_vsftpd_conf" "rsa_cert_file" "=" "$_real_fullchain" \
- && _setopt "$_vsftpd_conf" "rsa_private_key_file" "=" "$_real_key" \
- && _setopt "$_vsftpd_conf" "ssl_enable" "=" "YES"; then
+ if _setopt "$_vsftpd_conf" "rsa_cert_file" "=" "$_real_fullchain" &&
+ _setopt "$_vsftpd_conf" "rsa_private_key_file" "=" "$_real_key" &&
+ _setopt "$_vsftpd_conf" "ssl_enable" "=" "YES"; then
_info "Set config success!"
else
_err "Config vsftpd server error, please report bug to us."
diff --git a/dnsapi/dns_arvan.sh b/dnsapi/dns_arvan.sh
index edeb56ca..ca1f56c7 100644
--- a/dnsapi/dns_arvan.sh
+++ b/dnsapi/dns_arvan.sh
@@ -5,7 +5,7 @@
ARVAN_API_URL="https://napi.arvancloud.com/cdn/4.0/domains"
#Author: Ehsan Aliakbar
-#Report Bugs here: https://github.com/Neilpang/acme.sh
+#Report Bugs here: https://github.com/Neilpang/acme.sh
#
######## Public functions #####################
diff --git a/dnsapi/dns_aws.sh b/dnsapi/dns_aws.sh
index ea4736c4..068c337c 100755
--- a/dnsapi/dns_aws.sh
+++ b/dnsapi/dns_aws.sh
@@ -222,21 +222,21 @@ _use_instance_role() {
_use_metadata() {
_aws_creds="$(
- _get "$1" "" 1 \
- | _normalizeJson \
- | tr '{,}' '\n' \
- | while read -r _line; do
+ _get "$1" "" 1 |
+ _normalizeJson |
+ tr '{,}' '\n' |
+ while read -r _line; do
_key="$(echo "${_line%%:*}" | tr -d '"')"
_value="${_line#*:}"
_debug3 "_key" "$_key"
_secure_debug3 "_value" "$_value"
case "$_key" in
- AccessKeyId) echo "AWS_ACCESS_KEY_ID=$_value" ;;
- SecretAccessKey) echo "AWS_SECRET_ACCESS_KEY=$_value" ;;
- Token) echo "AWS_SESSION_TOKEN=$_value" ;;
+ AccessKeyId) echo "AWS_ACCESS_KEY_ID=$_value" ;;
+ SecretAccessKey) echo "AWS_SECRET_ACCESS_KEY=$_value" ;;
+ Token) echo "AWS_SESSION_TOKEN=$_value" ;;
esac
- done \
- | paste -sd' ' -
+ done |
+ paste -sd' ' -
)"
_secure_debug "_aws_creds" "$_aws_creds"
diff --git a/dnsapi/dns_azure.sh b/dnsapi/dns_azure.sh
index 28b6572a..ce8a3fa7 100644
--- a/dnsapi/dns_azure.sh
+++ b/dnsapi/dns_azure.sh
@@ -220,7 +220,7 @@ _azure_rest() {
export _H2="accept: application/json"
export _H3="Content-Type: application/json"
# clear headers from previous request to avoid getting wrong http code on timeouts
- :>"$HTTP_HEADER"
+ : >"$HTTP_HEADER"
_debug "$ep"
if [ "$m" != "GET" ]; then
_secure_debug2 "data $data"
diff --git a/dnsapi/dns_conoha.sh b/dnsapi/dns_conoha.sh
index d3bee130..ddc32074 100755
--- a/dnsapi/dns_conoha.sh
+++ b/dnsapi/dns_conoha.sh
@@ -115,9 +115,9 @@ dns_conoha_rm() {
return 1
fi
- record_id=$(printf "%s" "$response" | _egrep_o '{[^}]*}' \
- | grep '"type":"TXT"' | grep "\"data\":\"$txtvalue\"" | _egrep_o "\"id\":\"[^\"]*\"" \
- | _head_n 1 | cut -d : -f 2 | tr -d \")
+ record_id=$(printf "%s" "$response" | _egrep_o '{[^}]*}' |
+ grep '"type":"TXT"' | grep "\"data\":\"$txtvalue\"" | _egrep_o "\"id\":\"[^\"]*\"" |
+ _head_n 1 | cut -d : -f 2 | tr -d \")
if [ -z "$record_id" ]; then
_err "Can not get record id to remove."
return 1
diff --git a/dnsapi/dns_cyon.sh b/dnsapi/dns_cyon.sh
index 2dca90c0..2c08812b 100644
--- a/dnsapi/dns_cyon.sh
+++ b/dnsapi/dns_cyon.sh
@@ -18,23 +18,23 @@
########
dns_cyon_add() {
- _cyon_load_credentials \
- && _cyon_load_parameters "$@" \
- && _cyon_print_header "add" \
- && _cyon_login \
- && _cyon_change_domain_env \
- && _cyon_add_txt \
- && _cyon_logout
+ _cyon_load_credentials &&
+ _cyon_load_parameters "$@" &&
+ _cyon_print_header "add" &&
+ _cyon_login &&
+ _cyon_change_domain_env &&
+ _cyon_add_txt &&
+ _cyon_logout
}
dns_cyon_rm() {
- _cyon_load_credentials \
- && _cyon_load_parameters "$@" \
- && _cyon_print_header "delete" \
- && _cyon_login \
- && _cyon_change_domain_env \
- && _cyon_delete_txt \
- && _cyon_logout
+ _cyon_load_credentials &&
+ _cyon_load_parameters "$@" &&
+ _cyon_print_header "delete" &&
+ _cyon_login &&
+ _cyon_change_domain_env &&
+ _cyon_delete_txt &&
+ _cyon_logout
}
#########################
diff --git a/dnsapi/dns_da.sh b/dnsapi/dns_da.sh
index 4e9c4ef0..4d3e09b1 100755
--- a/dnsapi/dns_da.sh
+++ b/dnsapi/dns_da.sh
@@ -115,23 +115,23 @@ _da_api() {
_debug response "$response"
case "${cmd}" in
- CMD_API_DNS_CONTROL)
- # Parse the result in general
- # error=0&text=Records Deleted&details=
- # error=1&text=Cannot View Dns Record&details=No domain provided
- err_field="$(_getfield "$response" 1 '&')"
- txt_field="$(_getfield "$response" 2 '&')"
- details_field="$(_getfield "$response" 3 '&')"
- error="$(_getfield "$err_field" 2 '=')"
- text="$(_getfield "$txt_field" 2 '=')"
- details="$(_getfield "$details_field" 2 '=')"
- _debug "error: ${error}, text: ${text}, details: ${details}"
- if [ "$error" != "0" ]; then
- _err "error $response"
- return 1
- fi
- ;;
- CMD_API_SHOW_DOMAINS) ;;
+ CMD_API_DNS_CONTROL)
+ # Parse the result in general
+ # error=0&text=Records Deleted&details=
+ # error=1&text=Cannot View Dns Record&details=No domain provided
+ err_field="$(_getfield "$response" 1 '&')"
+ txt_field="$(_getfield "$response" 2 '&')"
+ details_field="$(_getfield "$response" 3 '&')"
+ error="$(_getfield "$err_field" 2 '=')"
+ text="$(_getfield "$txt_field" 2 '=')"
+ details="$(_getfield "$details_field" 2 '=')"
+ _debug "error: ${error}, text: ${text}, details: ${details}"
+ if [ "$error" != "0" ]; then
+ _err "error $response"
+ return 1
+ fi
+ ;;
+ CMD_API_SHOW_DOMAINS) ;;
esac
return 0
}
diff --git a/dnsapi/dns_do.sh b/dnsapi/dns_do.sh
index 3a2f8f49..3850890c 100755
--- a/dnsapi/dns_do.sh
+++ b/dnsapi/dns_do.sh
@@ -67,14 +67,14 @@ _dns_do_list_rrs() {
_err "getRRList origin ${_domain} failed"
return 1
fi
- _rr_list="$(echo "${response}" \
- | tr -d "\n\r\t" \
- | sed -e 's/