Skip to content
Permalink
Browse files

Merge pull request #2596 from Neilpang/dev

Dev
  • Loading branch information
Neilpang committed Nov 19, 2019
2 parents 3d2df3b + c282dd0 commit ef15e55947f0df966822cdbede6a1bd572970eb6
Showing with 425 additions and 11 deletions.
  1. +9 −9 acme.sh
  2. +1 −1 dnsapi/dns_nic.sh
  3. +414 −0 dnsapi/dns_pleskxml.sh
  4. +1 −1 notify/mailgun.sh
18 acme.sh
@@ -268,31 +268,31 @@ _usage() {
__debug_bash_helper() {
# At this point only do for --debug 3
if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -lt "$DEBUG_LEVEL_3" ]; then
echo ""
return
fi
# Return extra debug info when running with bash, otherwise return empty
# string.
if [ -z "${BASH_VERSION}" ]; then
echo ""
return
fi
# We are a bash shell at this point, return the filename, function name, and
# line number as a string
_dbh_saveIFS=$IFS
IFS=" "
# Must use eval or syntax error happens under dash
# Must use eval or syntax error happens under dash. The eval should use
# single quotes as older versions of busybox had a bug with double quotes and
# eval.
# Use 'caller 1' as we want one level up the stack as we should be called
# by one of the _debug* functions
eval "_dbh_called=($(caller 1))"
eval '_dbh_called=($(caller 1))'
IFS=$_dbh_saveIFS
_dbh_file=${_dbh_called[2]}
eval '_dbh_file=${_dbh_called[2]}'
if [ -n "${_script_home}" ]; then
# Trim off the _script_home directory name
_dbh_file=${_dbh_file#$_script_home/}
eval '_dbh_file=${_dbh_file#$_script_home/}'
fi
_dbh_function=${_dbh_called[1]}
_dbh_lineno=${_dbh_called[0]}
eval '_dbh_function=${_dbh_called[1]}'
eval '_dbh_lineno=${_dbh_called[0]}'
printf "%-40s " "$_dbh_file:${_dbh_function}:${_dbh_lineno}"
}

@@ -3365,7 +3365,7 @@ _on_issue_success() {
fi
fi

if _hasfield "$Le_Webroot" "$W_DNS"; then
if _hasfield "$Le_Webroot" "$W_DNS" && [ -z "$FORCE_DNS_MANUAL" ]; then
_err "$_DNS_MANUAL_WARN"
fi

@@ -89,7 +89,7 @@ dns_nic_rm() {
return 1
fi

_domain_id=$(printf "%s" "$response" | grep "$_sub_domain" | grep "$txtvalue" | sed -r "s/.*<rr id=\"(.*)\".*/\1/g")
_domain_id=$(printf "%s" "$response" | grep "$_sub_domain" | grep -- "$txtvalue" | sed -r "s/.*<rr id=\"(.*)\".*/\1/g")

if ! _nic_rest DELETE "services/$_service/zones/$_domain/records/$_domain_id"; then
_err "Delete record error"

0 comments on commit ef15e55

Please sign in to comment.
You can’t perform that action at this time.