getdnsconf

2025-12-27 06:02:08 +08:00 · 2019-07-16 18:31:33 +08:00
19 changed files with 117 additions and 993 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: acmesh
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # An ACME Shell script: acme.sh [![Build Status](https://travis-ci.org/Neilpang/acme.sh.svg?branch=master)](https://travis-ci.org/Neilpang/acme.sh)

-<a href="https://opencollective.com/acmesh" alt="Financial Contributors on Open Collective"><img src="https://opencollective.com/acmesh/all/badge.svg?label=financial+contributors" /></a> [![Join the chat at https://gitter.im/acme-sh/Lobby](https://badges.gitter.im/acme-sh/Lobby.svg)](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/acme-sh/Lobby](https://badges.gitter.im/acme-sh/Lobby.svg)](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 - An ACME protocol client written purely in Shell (Unix shell) language.
 - Full ACME protocol implementation.
 - Support ACME v1 and ACME v2
@@ -451,36 +451,6 @@ TODO:
 2. ACME protocol: https://github.com/ietf-wg-acme/acme


-## Contributors
-
-### Code Contributors
-
-This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
-<a href="https://github.com/Neilpang/acme.sh/graphs/contributors"><img src="https://opencollective.com/acmesh/contributors.svg?width=890&button=false" /></a>
-
-### Financial Contributors
-
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/acmesh/contribute)]
-
-#### Individuals
-
-<a href="https://opencollective.com/acmesh"><img src="https://opencollective.com/acmesh/individuals.svg?width=890"></a>
-
-#### Organizations
-
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/acmesh/contribute)]
-
-<a href="https://opencollective.com/acmesh/organization/0/website"><img src="https://opencollective.com/acmesh/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/1/website"><img src="https://opencollective.com/acmesh/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/2/website"><img src="https://opencollective.com/acmesh/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/3/website"><img src="https://opencollective.com/acmesh/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/4/website"><img src="https://opencollective.com/acmesh/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/5/website"><img src="https://opencollective.com/acmesh/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/6/website"><img src="https://opencollective.com/acmesh/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/7/website"><img src="https://opencollective.com/acmesh/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/8/website"><img src="https://opencollective.com/acmesh/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/9/website"><img src="https://opencollective.com/acmesh/organization/9/avatar.svg"></a>
-
 # 19. License & Others

 License is GPLv3
--- a/acme.sh
+++ b/acme.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh

-VER=2.8.4
+VER=2.8.2

 PROJECT_NAME="acme.sh"

@@ -90,9 +90,6 @@ DEBUG_LEVEL_3=3
 DEBUG_LEVEL_DEFAULT=$DEBUG_LEVEL_1
 DEBUG_LEVEL_NONE=0

-DOH_CLOUDFLARE=1
-DOH_GOOGLE=2
-
 HIDDEN_VALUE="[hidden](please add '--output-insecure' to see this value)"

 SYSLOG_ERROR="user.error"
@@ -138,8 +135,6 @@ _DNS_MANUAL_WIKI="https://github.com/Neilpang/acme.sh/wiki/dns-manual-mode"

 _NOTIFY_WIKI="https://github.com/Neilpang/acme.sh/wiki/notify"

-_SUDO_WIKI="https://github.com/Neilpang/acme.sh/wiki/sudo"
-
 _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"
@@ -814,11 +809,6 @@ _json_encode() {
  echo "$_j_str" | _hex_dump | _lower_case | sed 's/0a/5c 6e/g' | tr -d ' ' | _h2b | tr -d "\r\n"
 }

-#convert '\/' to '\'
-_json_decode() {
-  sed 's#\\/#/#g'
-}
-
 #options file
 _sed_i() {
  options="$1"
@@ -1705,37 +1695,18 @@ _post() {
    if [ "$HTTPS_INSECURE" ]; then
      _CURL="$_CURL --insecure  "
    fi
-    if [ "$httpmethod" = "HEAD" ]; then
-      _CURL="$_CURL -I  "
-    fi
    _debug "_CURL" "$_CURL"
    if [ "$needbase64" ]; then
-      if [ "$body" ]; then
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
-        fi
+      if [ "$_postContentType" ]; then
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
      else
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url" | _base64)"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url" | _base64)"
-        fi
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
      fi
    else
-      if [ "$body" ]; then
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
-        fi
+      if [ "$_postContentType" ]; then
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
      else
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url")"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url")"
-        fi
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
      fi
    fi
    _ret="$?"
@@ -1751,9 +1722,6 @@ _post() {
    if [ "$HTTPS_INSECURE" ]; then
      _WGET="$_WGET --no-check-certificate "
    fi
-    if [ "$httpmethod" = "HEAD" ]; then
-      _WGET="$_WGET --read-timeout=3.0  --tries=2  "
-    fi
    _debug "_WGET" "$_WGET"
    if [ "$needbase64" ]; then
      if [ "$httpmethod" = "POST" ]; then
@@ -1776,12 +1744,6 @@ _post() {
        else
          response="$($_WGET -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --post-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
        fi
-      elif [ "$httpmethod" = "HEAD" ]; then
-        if [ "$_postContentType" ]; then
-          response="$($_WGET --spider -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --header "Content-Type: $_postContentType" --post-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
-        else
-          response="$($_WGET --spider -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --post-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
-        fi
      else
        if [ "$_postContentType" ]; then
          response="$($_WGET -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --header "Content-Type: $_postContentType" --method $httpmethod --body-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
@@ -1914,7 +1876,7 @@ _send_signed_request() {
      if [ "$ACME_NEW_NONCE" ]; then
        _debug2 "Get nonce with HEAD. ACME_NEW_NONCE" "$ACME_NEW_NONCE"
        nonceurl="$ACME_NEW_NONCE"
-        if _post "" "$nonceurl" "" "HEAD" "$__request_conent_type" >/dev/null; then
+        if _post "" "$nonceurl" "" "HEAD" "$__request_conent_type"; then
          _headers="$(cat "$HTTP_HEADER")"
          _debug2 _headers "$_headers"
          _CACHED_NONCE="$(echo "$_headers" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)"
@@ -2138,6 +2100,26 @@ _getdeployconf() {
  eval "export $_rac_key=$_saved"
 }

+#key
+_getdnsapiconf() {
+  _rac_key="$1"
+  _rac_value="$(eval echo \$"$_rac_key")"
+  if [ "$_rac_value" ]; then
+    if _startswith "$_rac_value" '"' && _endswith "$_rac_value" '"'; then
+      _debug2 "trim quotation marks"
+      eval "export $_rac_key=$_rac_value"
+    fi
+    return 0 # do nothing
+  fi
+  _saved=$(_readaccountconf_mutable "$_rac_key")
+  eval "export $_rac_key=$_saved"
+}
+
+#key  value base64encode
+_savednsapiconf() {
+  _saveaccountconf_mutable "$@"
+}
+
 #_saveaccountconf  key  value  base64encode
 _saveaccountconf() {
  _save_conf "$ACCOUNT_CONF_PATH" "$@"
@@ -2400,7 +2382,7 @@ _initAPI() {
  _debug "_init api for server: $_api_server"

  if [ -z "$ACME_NEW_ACCOUNT" ]; then
-    response=$(_get "$_api_server" | _json_decode)
+    response=$(_get "$_api_server")
    if [ "$?" != "0" ]; then
      _debug2 "response" "$response"
      _err "Can not init api."
@@ -2835,11 +2817,6 @@ _setNginx() {
      _debug NGINX_CONF "$NGINX_CONF"
      NGINX_CONF="$(echo "$NGINX_CONF" | cut -d = -f 2)"
      _debug NGINX_CONF "$NGINX_CONF"
-      if [ -z "$NGINX_CONF" ]; then
-        _err "Can not find nginx conf."
-        NGINX_CONF=""
-        return 1
-      fi
      if [ ! -f "$NGINX_CONF" ]; then
        _err "'$NGINX_CONF' doesn't exist."
        NGINX_CONF=""
@@ -3078,13 +3055,11 @@ _clearupdns() {
    d=$(_getfield "$entry" 1)
    txtdomain=$(_getfield "$entry" 2)
    aliasDomain=$(_getfield "$entry" 3)
-    _currentRoot=$(_getfield "$entry" 4)
    txt=$(_getfield "$entry" 5)
    d_api=$(_getfield "$entry" 6)
    _debug "d" "$d"
    _debug "txtdomain" "$txtdomain"
    _debug "aliasDomain" "$aliasDomain"
-    _debug "_currentRoot" "$_currentRoot"
    _debug "txt" "$txt"
    _debug "d_api" "$d_api"
    if [ "$d_api" = "$txt" ]; then
@@ -3308,11 +3283,6 @@ _on_issue_success() {
  if [ "$_chk_post_hook" ]; then
    _info "Run post hook:'$_chk_post_hook'"
    if ! (
-      export CERT_PATH
-      export CERT_KEY_PATH
-      export CA_CERT_PATH
-      export CERT_FULLCHAIN_PATH
-      export Le_Domain="$_main_domain"
      cd "$DOMAIN_PATH" && eval "$_chk_post_hook"
    ); then
      _err "Error when run post hook."
@@ -3324,11 +3294,6 @@ _on_issue_success() {
  if [ "$IS_RENEW" ] && [ "$_chk_renew_hook" ]; then
    _info "Run renew hook:'$_chk_renew_hook'"
    if ! (
-      export CERT_PATH
-      export CERT_KEY_PATH
-      export CA_CERT_PATH
-      export CERT_FULLCHAIN_PATH
-      export Le_Domain="$_main_domain"
      cd "$DOMAIN_PATH" && eval "$_chk_renew_hook"
    ); then
      _err "Error when run renew hook."
@@ -3644,7 +3609,7 @@ __trigger_validation() {
 }

 #endpoint  domain type
-_ns_lookup_impl() {
+_ns_lookup() {
  _ns_ep="$1"
  _ns_domain="$2"
  _ns_type="$3"
@@ -3668,7 +3633,7 @@ _ns_lookup_cf() {
  _cf_ld="$1"
  _cf_ld_type="$2"
  _cf_ep="https://cloudflare-dns.com/dns-query"
-  _ns_lookup_impl "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
+  _ns_lookup "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
 }

 #domain, type
@@ -3676,49 +3641,11 @@ _ns_purge_cf() {
  _cf_d="$1"
  _cf_d_type="$2"
  _debug "Cloudflare purge $_cf_d_type record for domain $_cf_d"
-  _cf_purl="https://cloudflare-dns.com/api/v1/purge?domain=$_cf_d&type=$_cf_d_type"
+  _cf_purl="https://1.0.0.1/api/v1/purge?domain=$_cf_d&type=$_cf_d_type"
  response="$(_post "" "$_cf_purl")"
  _debug2 response "$response"
 }

-#checks if cf server is available
-_ns_is_available_cf() {
-  if _get "https://cloudflare-dns.com"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-#domain, type
-_ns_lookup_google() {
-  _cf_ld="$1"
-  _cf_ld_type="$2"
-  _cf_ep="https://dns.google/resolve"
-  _ns_lookup_impl "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
-}
-
-#domain, type
-_ns_lookup() {
-  if [ -z "$DOH_USE" ]; then
-    _debug "Detect dns server first."
-    if _ns_is_available_cf; then
-      _debug "Use cloudflare doh server"
-      export DOH_USE=$DOH_CLOUDFLARE
-    else
-      _debug "Use google doh server"
-      export DOH_USE=$DOH_GOOGLE
-    fi
-  fi
-
-  if [ "$DOH_USE" = "$DOH_CLOUDFLARE" ] || [ -z "$DOH_USE" ]; then
-    _ns_lookup_cf "$@"
-  else
-    _ns_lookup_google "$@"
-  fi
-
-}
-
 #txtdomain, alias, txt
 __check_txt() {
  _c_txtdomain="$1"
@@ -3727,7 +3654,7 @@ __check_txt() {
  _debug "_c_txtdomain" "$_c_txtdomain"
  _debug "_c_aliasdomain" "$_c_aliasdomain"
  _debug "_c_txt" "$_c_txt"
-  _answers="$(_ns_lookup "$_c_aliasdomain" TXT)"
+  _answers="$(_ns_lookup_cf "$_c_aliasdomain" TXT)"
  _contains "$_answers" "$_c_txt"

 }
@@ -3736,13 +3663,7 @@ __check_txt() {
 __purge_txt() {
  _p_txtdomain="$1"
  _debug _p_txtdomain "$_p_txtdomain"
-  if [ "$DOH_USE" = "$DOH_CLOUDFLARE" ] || [ -z "$DOH_USE" ]; then
-    _ns_purge_cf "$_p_txtdomain" "TXT"
-  else
-    _debug "no purge api for google dns api, just sleep 5 secs"
-    _sleep 5
-  fi
-
+  _ns_purge_cf "$_p_txtdomain" "TXT"
 }

 #wait and check each dns entries
@@ -3779,11 +3700,11 @@ _check_dns_entries() {
      fi
      _left=1
      _info "Not valid yet, let's wait 10 seconds and check next one."
+      _sleep 10
      __purge_txt "$txtdomain"
      if [ "$txtdomain" != "$aliasDomain" ]; then
        __purge_txt "$aliasDomain"
      fi
-      _sleep 10
    done
    if [ "$_left" ]; then
      _info "Let's wait 10 seconds and check again".
@@ -5026,14 +4947,18 @@ list() {
  if [ "$_raw" ]; then
    printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}Created${_sep}Renew"
    for di in "${CERT_HOME}"/*.*/; do
+      if ! [ -d "$di" ]; then
+        _debug "Not directory, skip: $di"
+        continue
+      fi
      d=$(basename "$di")
      _debug d "$d"
      (
        if _endswith "$d" "$ECC_SUFFIX"; then
-          _isEcc="ecc"
+          _isEcc=$(echo "$d" | cut -d "$ECC_SEP" -f 2)
          d=$(echo "$d" | cut -d "$ECC_SEP" -f 1)
        fi
-        DOMAIN_CONF="$di/$d.conf"
+        _initpath "$d" "$_isEcc"
        if [ -f "$DOMAIN_CONF" ]; then
          . "$DOMAIN_CONF"
          printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
@@ -6025,12 +5950,8 @@ _send_notify() {
  _send_err=0
  for _n_hook in $(echo "$_nhooks" | tr ',' " "); do
    _n_hook_file="$(_findHook "" $_SUB_FOLDER_NOTIFY "$_n_hook")"
-    _info "Sending via: $_n_hook"
-    _debug "Found $_n_hook_file for $_n_hook"
-    if [ -z "$_n_hook_file" ]; then
-      _err "Can not find the hook file for $_n_hook"
-      continue
-    fi
+    _info "Found $_n_hook_file"
+
    if ! (
      if ! . "$_n_hook_file"; then
        _err "Load file $_n_hook_file error. Please check your api file and try again."
@@ -6065,7 +5986,7 @@ _set_notify_hook() {
  _nhooks="$1"

  _test_subject="Hello, this is notification from $PROJECT_NAME"
-  _test_content="If you receive this message, your notification works."
+  _test_content="If you receive this email, your notification works."

  _send_notify "$_test_subject" "$_test_content" "$_nhooks" 0

@@ -6316,23 +6237,6 @@ _processAccountConf() {

 }

-_checkSudo() {
-  if [ "$SUDO_GID" ] && [ "$SUDO_COMMAND" ] && [ "$SUDO_USER" ] && [ "$SUDO_UID" ]; then
-    if [ "$SUDO_USER" = "root" ] && [ "$SUDO_UID" = "0" ]; then
-      #it's root using sudo, no matter it's using sudo or not, just fine
-      return 0
-    fi
-    if [ "$SUDO_COMMAND" = "/bin/su" ] || [ "$SUDO_COMMAND" = "/bin/bash" ]; then
-      #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
-      #fine
-      return 0
-    fi
-    #otherwise
-    return 1
-  fi
-  return 0
-}
-
 _process() {
  _CMD=""
  _domain=""
@@ -6584,10 +6488,6 @@ _process() {
        ;;
      --nginx)
        wvalue="$NGINX"
-        if [ "$2" ] && ! _startswith "$2" "-"; then
-          wvalue="$NGINX$2"
-          shift
-        fi
        if [ -z "$_webroot" ]; then
          _webroot="$wvalue"
        else
@@ -6865,14 +6765,6 @@ _process() {
  done

  if [ "${_CMD}" != "install" ]; then
-    if [ "$__INTERACTIVE" ] && ! _checkSudo; then
-      if [ -z "$FORCE" ]; then
-        #Use "echo" here, instead of _info. it's too early
-        echo "It seems that you are using sudo, please read this link first:"
-        echo "$_SUDO_WIKI"
-        return 1
-      fi
-    fi
    __initHome
    if [ "$_log" ]; then
      if [ -z "$_logfile" ]; then
@@ -6915,7 +6807,7 @@ _process() {
      _debug "Using server: $_server"
    fi
  fi
-  _debug "Running cmd: ${_CMD}"
+
  case "${_CMD}" in
    install) install "$_nocron" "$_confighome" "$_noprofile" ;;
    uninstall) uninstall "$_nocron" ;;
--- a/deploy/docker.sh
+++ b/deploy/docker.sh
@@ -126,7 +126,6 @@ docker_deploy() {
  fi

  if [ "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD" ]; then
-    _info "Reloading: $DEPLOY_DOCKER_CONTAINER_RELOAD_CMD"
    if ! _docker_exec "$_cid" "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD"; then
      return 1
    fi
@@ -224,8 +223,7 @@ _docker_cp() {
    _debug2 "_frompath" "$_frompath"
    _toname="$(basename "$_to")"
    _debug2 "_toname" "$_toname"
-    _debug2 "_from" "$_from"
-    if ! tar --transform="s,$(printf "%s" "$_frompath" | tr '*' .),$_toname," -cz "$_from" 2>/dev/null | _curl_unix_sock "$_DOCKER_SOCK" PUT "/containers/$_dcid/archive?noOverwriteDirNonDir=1&path=$(printf "%s" "$_dir" | _url_encode)" '@-' "Content-Type: application/octet-stream"; then
+    if ! tar --transform="s,$_frompath,$_toname," -cz "$_from" 2>/dev/null | _curl_unix_sock "$_DOCKER_SOCK" PUT "/containers/$_dcid/archive?noOverwriteDirNonDir=1&path=$(printf "%s" "$_dir" | _url_encode)" '@-' "Content-Type: application/octet-stream"; then
      _err "copy error"
      return 1
    fi
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh

 # Here is the script to deploy the cert to G-Core CDN service (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
+# Uses command line curl for send requests and jq for parse responses.
 # Returns 0 when success.
 #
 # Written by temoffey <temofffey@gmail.com>
@@ -116,7 +117,7 @@ gcore_cdn_deploy() {
  _debug _request "$_request"
  _response=$(_post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
  _debug _response "$_response"
-  _regex=".*\"sslData\":\([0-9]*\).*$"
+  _regex=".*\"sslData\":\([0-9]*\)}.*$"
  _debug _regex "$_regex"
  _sslDataNew=$(echo "$_response" | sed -n "s/$_regex/\1/p")
  _debug _sslDataNew "$_sslDataNew"
--- a/dnsapi/dns_ali.sh
+++ b/dnsapi/dns_ali.sh
@@ -185,7 +185,7 @@ _clean() {
    return 1
  fi

-  record_id="$(echo "$response" | tr '{' "\n" | grep "$_sub_domain" | grep -- "$txtvalue" | tr "," "\n" | grep RecordId | cut -d '"' -f 4)"
+  record_id="$(echo "$response" | tr '{' "\n" | grep "$_sub_domain" | grep "$txtvalue" | tr "," "\n" | grep RecordId | cut -d '"' -f 4)"
  _debug2 record_id "$record_id"

  if [ -z "$record_id" ]; then
--- a/dnsapi/dns_cf.sh
+++ b/dnsapi/dns_cf.sh
@@ -5,9 +5,6 @@
 #
 #CF_Email="xxxx@sss.com"

-#CF_Token="xxxx"
-#CF_Account_ID="xxxx"
-
 CF_Api="https://api.cloudflare.com/client/v4"

 ########  Public functions #####################
@@ -17,33 +14,27 @@ dns_cf_add() {
  fulldomain=$1
  txtvalue=$2

-  CF_Token="${CF_Token:-$(_readaccountconf_mutable CF_Token)}"
-  CF_Account_ID="${CF_Account_ID:-$(_readaccountconf_mutable CF_Account_ID)}"
-  CF_Key="${CF_Key:-$(_readaccountconf_mutable CF_Key)}"
-  CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
+  _getdnsapiconf CF_Key
+  _getdnsapiconf CF_Email

-  if [ "$CF_Token" ]; then
-    _saveaccountconf_mutable CF_Token "$CF_Token"
-    _saveaccountconf_mutable CF_Account_ID "$CF_Account_ID"
-  else
-    if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
-      CF_Key=""
-      CF_Email=""
-      _err "You didn't specify a Cloudflare api key and email yet."
-      _err "You can get yours from here https://dash.cloudflare.com/profile."
-      return 1
-    fi
-
-    if ! _contains "$CF_Email" "@"; then
-      _err "It seems that the CF_Email=$CF_Email is not a valid email address."
-      _err "Please check and retry."
-      return 1
-    fi
-    #save the api key and email to the account conf file.
-    _saveaccountconf_mutable CF_Key "$CF_Key"
-    _saveaccountconf_mutable CF_Email "$CF_Email"
+  if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
+    CF_Key=""
+    CF_Email=""
+    _err "You didn't specify a Cloudflare api key and email yet."
+    _err "You can get yours from here https://dash.cloudflare.com/profile."
+    return 1
  fi

+  if ! _contains "$CF_Email" "@"; then
+    _err "It seems that the CF_Email=$CF_Email is not a valid email address."
+    _err "Please check and retry."
+    return 1
+  fi
+
+  #save the api key and email to the account conf file.
+  _savednsapiconf CF_Key "$CF_Key"
+  _savednsapiconf CF_Email "$CF_Email"
+
  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
    _err "invalid domain"
@@ -81,6 +72,19 @@ dns_cf_add() {
  fi
  _err "Add txt record error."
  return 1
+  #  else
+  #    _info "Updating record"
+  #    record_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | head -n 1)
+  #    _debug "record_id" "$record_id"
+  #
+  #    _cf_rest PUT "zones/$_domain_id/dns_records/$record_id" "{\"id\":\"$record_id\",\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":\"$txtvalue\",\"zone_id\":\"$_domain_id\",\"zone_name\":\"$_domain\"}"
+  #    if [ "$?" = "0" ]; then
+  #      _info "Updated, OK"
+  #      return 0
+  #    fi
+  #    _err "Update error"
+  #    return 1
+  #  fi

 }

@@ -89,10 +93,15 @@ dns_cf_rm() {
  fulldomain=$1
  txtvalue=$2

-  CF_Token="${CF_Token:-$(_readaccountconf_mutable CF_Token)}"
-  CF_Account_ID="${CF_Account_ID:-$(_readaccountconf_mutable CF_Account_ID)}"
-  CF_Key="${CF_Key:-$(_readaccountconf_mutable CF_Key)}"
-  CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
+  _getdnsapiconf CF_Key
+  _getdnsapiconf CF_Email
+  if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
+    CF_Key=""
+    CF_Email=""
+    _err "You didn't specify a Cloudflare api key and email yet."
+    _err "You can get yours from here https://dash.cloudflare.com/profile."
+    return 1
+  fi

  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
@@ -149,14 +158,8 @@ _get_root() {
      return 1
    fi

-    if [ "$CF_Account_ID" ]; then
-      if ! _cf_rest GET "zones?name=$h&account.id=$CF_Account_ID"; then
-        return 1
-      fi
-    else
-      if ! _cf_rest GET "zones?name=$h"; then
-        return 1
-      fi
+    if ! _cf_rest GET "zones?name=$h"; then
+      return 1
    fi

    if _contains "$response" "\"name\":\"$h\"" || _contains "$response" '"total_count":1'; then
@@ -180,17 +183,12 @@ _cf_rest() {
  data="$3"
  _debug "$ep"

-  email_trimmed=$(echo "$CF_Email" | tr -d '"')
-  key_trimmed=$(echo "$CF_Key" | tr -d '"')
-  token_trimmed=$(echo "$CF_Token" | tr -d '"')
+  email_trimmed=$(echo $CF_Email | tr -d '"')
+  key_trimmed=$(echo $CF_Key | tr -d '"')

-  export _H1="Content-Type: application/json"
-  if [ "$token_trimmed" ]; then
-    export _H2="Authorization: Bearer $token_trimmed"
-  else
-    export _H2="X-Auth-Email: $email_trimmed"
-    export _H3="X-Auth-Key: $key_trimmed"
-  fi
+  export _H1="X-Auth-Email: $email_trimmed"
+  export _H2="X-Auth-Key: $key_trimmed"
+  export _H3="Content-Type: application/json"

  if [ "$m" != "GET" ]; then
    _debug data "$data"
--- a/dnsapi/dns_desec.sh
+++ b/dnsapi/dns_desec.sh
@@ -25,8 +25,8 @@ dns_desec_add() {
  if [ -z "$DEDYN_TOKEN" ] || [ -z "$DEDYN_NAME" ]; then
    DEDYN_TOKEN=""
    DEDYN_NAME=""
-    _err "You did not specify DEDYN_TOKEN and DEDYN_NAME yet."
-    _err "Please create your key and try again."
+    _err "You don't specify DEDYN_TOKEN and DEDYN_NAME yet."
+    _err "Please create you key and try again."
    _err "e.g."
    _err "export DEDYN_TOKEN=d41d8cd98f00b204e9800998ecf8427e"
    _err "export DEDYN_NAME=foobar.dedyn.io"
@@ -92,8 +92,8 @@ dns_desec_rm() {
  if [ -z "$DEDYN_TOKEN" ] || [ -z "$DEDYN_NAME" ]; then
    DEDYN_TOKEN=""
    DEDYN_NAME=""
-    _err "You did not specify DEDYN_TOKEN and DEDYN_NAME yet."
-    _err "Please create your key and try again."
+    _err "You don't specify DEDYN_TOKEN and DEDYN_NAME yet."
+    _err "Please create you key and try again."
    _err "e.g."
    _err "export DEDYN_TOKEN=d41d8cd98f00b204e9800998ecf8427e"
    _err "export DEDYN_NAME=foobar.dedyn.io"
--- a/dnsapi/dns_domeneshop.sh
+++ b/dnsapi/dns_domeneshop.sh
@@ -1,155 +0,0 @@
-#!/usr/bin/env sh
-
-DOMENESHOP_Api_Endpoint="https://api.domeneshop.no/v0"
-
-#####################  Public functions #####################
-
-# Usage: dns_domeneshop_add <full domain> <txt record>
-# Example: dns_domeneshop_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_domeneshop_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  # Get token and secret
-  DOMENESHOP_Token="${DOMENESHOP_Token:-$(_readaccountconf_mutable DOMENESHOP_Token)}"
-  DOMENESHOP_Secret="${DOMENESHOP_Secret:-$(_readaccountconf_mutable DOMENESHOP_Secret)}"
-
-  if [ -z "$DOMENESHOP_Token" ] || [ -z "$DOMENESHOP_Secret" ]; then
-    DOMENESHOP_Token=""
-    DOMENESHOP_Secret=""
-    _err "You need to spesify a Domeneshop/Domainnameshop API Token and Secret."
-    return 1
-  fi
-
-  # Save the api token and secret.
-  _saveaccountconf_mutable DOMENESHOP_Token "$DOMENESHOP_Token"
-  _saveaccountconf_mutable DOMENESHOP_Secret "$DOMENESHOP_Secret"
-
-  # Get the domain name id
-  if ! _get_domainid "$fulldomain"; then
-    _err "Did not find domainname"
-    return 1
-  fi
-
-  # Create record
-  _domeneshop_rest POST "domains/$_domainid/dns" "{\"type\":\"TXT\",\"host\":\"$_sub_domain\",\"data\":\"$txtvalue\",\"ttl\":120}"
-}
-
-# Usage: dns_domeneshop_rm <full domain> <txt record>
-# Example: dns_domeneshop_rm _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_domeneshop_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  # Get token and secret
-  DOMENESHOP_Token="${DOMENESHOP_Token:-$(_readaccountconf_mutable DOMENESHOP_Token)}"
-  DOMENESHOP_Secret="${DOMENESHOP_Secret:-$(_readaccountconf_mutable DOMENESHOP_Secret)}"
-
-  if [ -z "$DOMENESHOP_Token" ] || [ -z "$DOMENESHOP_Secret" ]; then
-    DOMENESHOP_Token=""
-    DOMENESHOP_Secret=""
-    _err "You need to spesify a Domeneshop/Domainnameshop API Token and Secret."
-    return 1
-  fi
-
-  # Get the domain name id
-  if ! _get_domainid "$fulldomain"; then
-    _err "Did not find domainname"
-    return 1
-  fi
-
-  # Find record
-  if ! _get_recordid "$_domainid" "$_sub_domain" "$txtvalue"; then
-    _err "Did not find dns record"
-    return 1
-  fi
-
-  # Remove record
-  _domeneshop_rest DELETE "domains/$_domainid/dns/$_recordid"
-}
-
-#####################  Private functions #####################
-
-_get_domainid() {
-  domain=$1
-
-  # Get domains
-  _domeneshop_rest GET "domains"
-
-  if ! _contains "$response" "\"id\":"; then
-    _err "failed to get domain names"
-    return 1
-  fi
-
-  i=2
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug "h" "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if _contains "$response" "\"$h\"" >/dev/null; then
-      # We have found the domain name.
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain=$h
-      _domainid=$(printf "%s" "$response" | _egrep_o "[^{]*\"domain\":\"$_domain\"[^}]*" | _egrep_o "\"id\":[0-9]+" | cut -d : -f 2)
-      return 0
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_get_recordid() {
-  domainid=$1
-  subdomain=$2
-  txtvalue=$3
-
-  # Get all dns records for the domainname
-  _domeneshop_rest GET "domains/$domainid/dns"
-
-  if ! _contains "$response" "\"id\":"; then
-    _debug "No records in dns"
-    return 1
-  fi
-
-  if ! _contains "$response" "\"host\":\"$subdomain\""; then
-    _debug "Record does not exist"
-    return 1
-  fi
-
-  # Get the id of the record in question
-  _recordid=$(printf "%s" "$response" | _egrep_o "[^{]*\"host\":\"$subdomain\"[^}]*" | _egrep_o "[^{]*\"data\":\"$txtvalue\"[^}]*" | _egrep_o "\"id\":[0-9]+" | cut -d : -f 2)
-  if [ -z "$_recordid" ]; then
-    return 1
-  fi
-  return 0
-}
-
-_domeneshop_rest() {
-  method=$1
-  endpoint=$2
-  data=$3
-
-  credentials=$(printf "%b" "$DOMENESHOP_Token:$DOMENESHOP_Secret" | _base64)
-
-  export _H1="Authorization: Basic $credentials"
-  export _H2="Content-Type: application/json"
-
-  if [ "$method" != "GET" ]; then
-    response="$(_post "$data" "$DOMENESHOP_Api_Endpoint/$endpoint" "" "$method")"
-  else
-    response="$(_get "$DOMENESHOP_Api_Endpoint/$endpoint")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $endpoint"
-    return 1
-  fi
-
-  return 0
-}
--- a/dnsapi/dns_dp.sh
+++ b/dnsapi/dns_dp.sh
@@ -63,7 +63,7 @@ dns_dp_rm() {
    return 0
  fi

-  record_id=$(echo "$response" | tr "{" "\n" | grep -- "$txtvalue" | grep '^"id"' | cut -d : -f 2 | cut -d '"' -f 2)
+  record_id=$(echo "$response" | tr "{" "\n" | grep "$txtvalue" | grep '^"id"' | cut -d : -f 2 | cut -d '"' -f 2)
  _debug record_id "$record_id"
  if [ -z "$record_id" ]; then
    _err "Can not get record id."
--- a/dnsapi/dns_he.sh
+++ b/dnsapi/dns_he.sh
@@ -134,9 +134,9 @@ _find_zone() {
  _zone_ids=$(echo "$_matches" | _egrep_o "hosted_dns_zoneid=[0-9]*&" | cut -d = -f 2 | tr -d '&')
  _zone_names=$(echo "$_matches" | _egrep_o "name=.*onclick" | cut -d '"' -f 2)
  _debug2 "These are the zones on this HE account:"
-  _debug2 "_zone_names" "$_zone_names"
+  _debug2 "$_zone_names"
  _debug2 "And these are their respective IDs:"
-  _debug2 "_zone_ids" "$_zone_ids"
+  _debug2 "$_zone_ids"
  if [ -z "$_zone_names" ] || [ -z "$_zone_ids" ]; then
    _err "Can not get zone names."
    return 1
@@ -154,14 +154,10 @@ _find_zone() {

    _debug "Looking for zone \"${_attempted_zone}\""

-    line_num="$(echo "$_zone_names" | grep -n "^$_attempted_zone\$" | _head_n 1 | cut -d : -f 1)"
-    _debug2 line_num "$line_num"
+    line_num="$(echo "$_zone_names" | grep -n "^$_attempted_zone" | cut -d : -f 1)"
+
    if [ "$line_num" ]; then
      _zone_id=$(echo "$_zone_ids" | sed -n "${line_num}p")
-      if [ -z "$_zone_id" ]; then
-        _err "Can not find zone id."
-        return 1
-      fi
      _debug "Found relevant zone \"$_attempted_zone\" with id \"$_zone_id\" - will be used for domain \"$_domain\"."
      return 0
    fi
--- a/dnsapi/dns_hexonet.sh
+++ b/dnsapi/dns_hexonet.sh
@@ -1,156 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Hexonet_Login="username!roleId"
-#
-# Hexonet_Password="rolePassword"
-
-Hexonet_Api="https://coreapi.1api.net/api/call.cgi"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_hexonet_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  Hexonet_Login="${Hexonet_Login:-$(_readaccountconf_mutable Hexonet_Login)}"
-  Hexonet_Password="${Hexonet_Password:-$(_readaccountconf_mutable Hexonet_Password)}"
-  if [ -z "$Hexonet_Login" ] || [ -z "$Hexonet_Password" ]; then
-    Hexonet_Login=""
-    Hexonet_Password=""
-    _err "You must export variables: Hexonet_Login and Hexonet_Password"
-    return 1
-  fi
-
-  if ! _contains "$Hexonet_Login" "!"; then
-    _err "It seems that the Hexonet_Login=$Hexonet_Login is not a restrivteed user."
-    _err "Please check and retry."
-    return 1
-  fi
-
-  #save the username and password to the account conf file.
-  _saveaccountconf_mutable Hexonet_Login "$Hexonet_Login"
-  _saveaccountconf_mutable Hexonet_Password "$Hexonet_Password"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}.&RRTYPE=TXT"
-
-  if ! _contains "$response" "CODE=200"; then
-    _err "Error"
-    return 1
-  fi
-
-  _info "Adding record"
-  if _hexonet_rest "command=UpdateDNSZone&dnszone=${_domain}.&addrr0=${_sub_domain}%20IN%20TXT%20${txtvalue}"; then
-    if _contains "$response" "CODE=200"; then
-      _info "Added, OK"
-      return 0
-    else
-      _err "Add txt record error."
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-  return 1
-
-}
-
-#fulldomain txtvalue
-dns_hexonet_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  Hexonet_Login="${Hexonet_Login:-$(_readaccountconf_mutable Hexonet_Login)}"
-  Hexonet_Password="${Hexonet_Password:-$(_readaccountconf_mutable Hexonet_Password)}"
-  if [ -z "$Hexonet_Login" ] || [ -z "$Hexonet_Password" ]; then
-    Hexonet_Login=""
-    Hexonet_Password=""
-    _err "You must export variables: Hexonet_Login and Hexonet_Password"
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}.&RRTYPE=TXT&RR=${txtvalue}"
-
-  if ! _contains "$response" "CODE=200"; then
-    _err "Error"
-    return 1
-  fi
-
-  count=$(printf "%s\n" "$response" | _egrep_o "PROPERTY[TOTAL][0]=" | cut -d = -f 2)
-  _debug count "$count"
-  if [ "$count" = "0" ]; then
-    _info "Don't need to remove."
-  else
-    if ! _hexonet_rest "&command=UpdateDNSZone&dnszone=${_domain}.&delrr0='${_sub_domain}%20IN%20TXT%20\"${txtvalue}\""; then
-      _err "Delete record error."
-      return 1
-    fi
-    _contains "$response" "CODE=200"
-  fi
-
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if ! _hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}."; then
-      return 1
-    fi
-
-    if _contains "$response" "CODE=200"; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain=$h
-      return 0
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_hexonet_rest() {
-  query_params="$1"
-  _debug "$query_params"
-
-  response="$(_get "${Hexonet_Api}?s_login=${Hexonet_Login}&s_pw=${Hexonet_Password}&${query_params}")"
-
-  if [ "$?" != "0" ]; then
-    _err "error $query_params"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}
--- a/dnsapi/dns_linode_v4.sh
+++ b/dnsapi/dns_linode_v4.sh
@@ -31,8 +31,7 @@ dns_linode_v4_add() {
  _payload="{
              \"type\": \"TXT\",
              \"name\": \"$_sub_domain\",
-              \"target\": \"$txtvalue\",
-              \"ttl_sec\": 300
+              \"target\": \"$txtvalue\"
            }"

  if _rest POST "/$_domain_id/records" "$_payload" && [ -n "$response" ]; then
--- a/dnsapi/dns_namesilo.sh
+++ b/dnsapi/dns_namesilo.sh
@@ -59,14 +59,9 @@ dns_namesilo_rm() {
  if _namesilo_rest GET "dnsListRecords?version=1&type=xml&key=$Namesilo_Key&domain=$_domain"; then
    retcode=$(printf "%s\n" "$response" | _egrep_o "<code>300")
    if [ "$retcode" ]; then
-      _record_id=$(echo "$response" | _egrep_o "<record_id>([^<]*)</record_id><type>TXT</type><host>$fulldomain</host>" | _egrep_o "<record_id>([^<]*)</record_id>" | sed -r "s/<record_id>([^<]*)<\/record_id>/\1/" | tail -n 1)
-      _debug _record_id "$_record_id"
-      if [ "$_record_id" ]; then
-        _info "Successfully retrieved the record id for ACME challenge."
-      else
-        _info "Empty record id, it seems no such record."
-        return 0
-      fi
+      _record_id=$(printf "%s\n" "$response" | _egrep_o "<record_id>([^<]*)</record_id><type>TXT</type><host>$fulldomain</host>" | _egrep_o "<record_id>([^<]*)</record_id>" | sed -r "s/<record_id>([^<]*)<\/record_id>/\1/" | tail -n 1)
+      _debug record_id "$_record_id"
+      _info "Successfully retrieved the record id for ACME challenge."
    else
      _err "Unable to retrieve the record id."
      return 1
@@ -110,7 +105,7 @@ _get_root() {
      return 1
    fi

-    if _contains "$response" "<domain>$host"; then
+    if _contains "$response" "$host"; then
      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
      _domain="$host"
      return 0
--- a/dnsapi/dns_vultr.sh
+++ b/dnsapi/dns_vultr.sh
@@ -1,163 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#VULTR_API_KEY=000011112222333344445555666677778888
-
-VULTR_Api="https://api.vultr.com/v1"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_vultr_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  VULTR_API_KEY="${VULTR_API_KEY:-$(_readaccountconf_mutable VULTR_API_KEY)}"
-  if test -z "$VULTR_API_KEY"; then
-    VULTR_API_KEY=''
-    _err 'VULTR_API_KEY was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable VULTR_API_KEY "$VULTR_API_KEY"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug 'Getting txt records'
-  _vultr_rest GET "dns/records?domain=$_domain"
-
-  if printf "%s\n" "$response" | grep "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then
-    _err 'Error'
-    return 1
-  fi
-
-  if ! _vultr_rest POST 'dns/create_record' "domain=$_domain&name=$_sub_domain&data=\"$txtvalue\"&type=TXT"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-#fulldomain txtvalue
-dns_vultr_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  VULTR_API_KEY="${VULTR_API_KEY:-$(_readaccountconf_mutable VULTR_API_KEY)}"
-  if test -z "$VULTR_API_KEY"; then
-    VULTR_API_KEY=""
-    _err 'VULTR_API_KEY was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable VULTR_API_KEY "$VULTR_API_KEY"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug 'Getting txt records'
-  _vultr_rest GET "dns/records?domain=$_domain"
-
-  if printf "%s\n" "$response" | grep "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then
-    _err 'Error'
-    return 1
-  fi
-
-  _record_id="$(echo "$response" | tr '{}' '\n' | grep '"TXT"' | grep "$txtvalue" | tr ',' '\n' | grep -i 'RECORDID' | cut -d : -f 2)"
-  _debug _record_id "$_record_id"
-  if [ "$_record_id" ]; then
-    _info "Successfully retrieved the record id for ACME challenge."
-  else
-    _info "Empty record id, it seems no such record."
-    return 0
-  fi
-
-  if ! _vultr_rest POST 'dns/delete_record' "domain=$_domain&RECORDID=$_record_id"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-# _domain_id=sdjkglgdfewsdfg
-_get_root() {
-  domain=$1
-  i=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      return 1
-    fi
-
-    if ! _vultr_rest GET "dns/list"; then
-      return 1
-    fi
-
-    if printf "%s\n" "$response" | grep '^\[.*\]' >/dev/null; then
-      if _contains "$response" "\"domain\":\"$_domain\""; then
-        _sub_domain="$(echo "$fulldomain" | sed "s/\\.$_domain\$//")"
-        _domain=$_domain
-        return 0
-      else
-        _err 'Invalid domain'
-        return 1
-      fi
-    else
-      _err "$response"
-      return 1
-    fi
-    i=$(_math "$i" + 1)
-  done
-
-  return 1
-}
-
-_vultr_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  api_key_trimmed=$(echo $VULTR_API_KEY | tr -d '"')
-
-  export _H1="Api-Key: $api_key_trimmed"
-  export _H2='Content-Type: application/x-www-form-urlencoded'
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$VULTR_Api/$ep" "" "$m")"
-  else
-    response="$(_get "$VULTR_Api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "Error $ep"
-    return 1
-  fi
-
-  _debug2 response "$response"
-  return 0
-}
--- a/notify/ifttt.sh
+++ b/notify/ifttt.sh
@@ -1,86 +0,0 @@
-#!/usr/bin/env sh
-
-#Support ifttt.com webhooks api
-
-#IFTTT_API_KEY="xxxx"
-#IFTTT_EVENT_NAME="yyyy"
-
-#IFTTT_SUBJECT_KEY="value1|value2|value3"      #optional, use "value1" as default
-#IFTTT_CONTENT_KEY="value1|value2|value3"      #optional, use "value2" as default
-
-_IFTTT_AVAIL_MSG_KEYS="value1,value2,value3"
-
-# subject  content statusCode
-ifttt_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_subject" "$_subject"
-  _debug "_content" "$_content"
-  _debug "_statusCode" "$_statusCode"
-
-  IFTTT_API_KEY="${IFTTT_API_KEY:-$(_readaccountconf_mutable IFTTT_API_KEY)}"
-  if [ -z "$IFTTT_API_KEY" ]; then
-    IFTTT_API_KEY=""
-    _err "You didn't specify a ifttt webhooks api key IFTTT_API_KEY yet."
-    _err "You can get yours from https://ifttt.com"
-    return 1
-  fi
-  _saveaccountconf_mutable IFTTT_API_KEY "$IFTTT_API_KEY"
-
-  IFTTT_EVENT_NAME="${IFTTT_EVENT_NAME:-$(_readaccountconf_mutable IFTTT_EVENT_NAME)}"
-  if [ -z "$IFTTT_EVENT_NAME" ]; then
-    IFTTT_EVENT_NAME=""
-    _err "You didn't specify a ifttt webhooks event name IFTTT_EVENT_NAME yet."
-    return 1
-  fi
-  _saveaccountconf_mutable IFTTT_EVENT_NAME "$IFTTT_EVENT_NAME"
-
-  IFTTT_SUBJECT_KEY="${IFTTT_SUBJECT_KEY:-$(_readaccountconf_mutable IFTTT_SUBJECT_KEY)}"
-  if [ -z "$IFTTT_SUBJECT_KEY" ]; then
-    IFTTT_SUBJECT_KEY="value1"
-    _info "The IFTTT_SUBJECT_KEY is not set, so use the default value1 as key."
-  elif ! _hasfield "$_IFTTT_AVAIL_MSG_KEYS" "$IFTTT_SUBJECT_KEY"; then
-    _err "The IFTTT_SUBJECT_KEY \"$IFTTT_SUBJECT_KEY\" is not available, should be one of $_IFTTT_AVAIL_MSG_KEYS"
-    IFTTT_SUBJECT_KEY=""
-    return 1
-  else
-    _saveaccountconf_mutable IFTTT_SUBJECT_KEY "$IFTTT_SUBJECT_KEY"
-  fi
-
-  IFTTT_CONTENT_KEY="${IFTTT_CONTENT_KEY:-$(_readaccountconf_mutable IFTTT_CONTENT_KEY)}"
-  if [ -z "$IFTTT_CONTENT_KEY" ]; then
-    IFTTT_CONTENT_KEY="value2"
-    _info "The IFTTT_CONTENT_KEY is not set, so use the default value2 as key."
-  elif ! _hasfield "$_IFTTT_AVAIL_MSG_KEYS" "$IFTTT_CONTENT_KEY"; then
-    _err "The IFTTT_CONTENT_KEY \"$IFTTT_CONTENT_KEY\" is not available, should be one of $_IFTTT_AVAIL_MSG_KEYS"
-    IFTTT_CONTENT_KEY=""
-    return 1
-  else
-    _saveaccountconf_mutable IFTTT_CONTENT_KEY "$IFTTT_CONTENT_KEY"
-  fi
-
-  if [ "$IFTTT_SUBJECT_KEY" = "$IFTTT_CONTENT_KEY" ]; then
-    IFTTT_SUBJECT_KEY=""
-    IFTTT_CONTENT_KEY=""
-    _err "The IFTTT_SUBJECT_KEY must not be same as IFTTT_CONTENT_KEY."
-    return 1
-  fi
-
-  IFTTT_API_URL="https://maker.ifttt.com/trigger/$IFTTT_EVENT_NAME/with/key/$IFTTT_API_KEY"
-
-  _content=$(echo "$_content" | _json_encode)
-  _subject=$(echo "$_subject" | _json_encode)
-  _data="{\"$IFTTT_SUBJECT_KEY\": \"$_subject\", \"$IFTTT_CONTENT_KEY\": \"$_content\"}"
-
-  response="$(_post "$_data" "$IFTTT_API_URL" "" "POST" "application/json")"
-
-  if [ "$?" = "0" ] && _contains "$response" "Congratulations"; then
-    _info "IFTTT webhooks event fired success."
-    return 0
-  fi
-
-  _err "IFTTT webhooks event fired error."
-  _err "$response"
-  return 1
-}
--- a/notify/pushover.sh
+++ b/notify/pushover.sh
@@ -1,63 +0,0 @@
-#!/usr/bin/env sh
-
-#Support for pushover.net's api. Push notification platform for multiple platforms
-#PUSHOVER_TOKEN="" Required, pushover application token
-#PUSHOVER_USER="" Required, pushover userkey
-#PUSHOVER_DEVICE="" Optional, Specific device or devices by hostnames, joining multiples with a comma (such as device=iphone,nexus5)
-#PUSHOVER_PRIORITY="" Optional, Lowest Priority (-2), Low Priority (-1), Normal Priority (0), High Priority (1)
-
-PUSHOVER_URI="https://api.pushover.net/1/messages.json"
-
-pushover_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_statusCode" "$_statusCode"
-
-  PUSHOVER_TOKEN="${PUSHOVER_TOKEN:-$(_readaccountconf_mutable PUSHOVER_TOKEN)}"
-  if [ -z "$PUSHOVER_TOKEN" ]; then
-    PUSHOVER_TOKEN=""
-    _err "You didn't specify a PushOver application token yet."
-    return 1
-  fi
-  _saveaccountconf_mutable PUSHOVER_TOKEN "$PUSHOVER_TOKEN"
-
-  PUSHOVER_USER="${PUSHOVER_USER:-$(_readaccountconf_mutable PUSHOVER_USER)}"
-  if [ -z "$PUSHOVER_USER" ]; then
-    PUSHOVER_USER=""
-    _err "You didn't specify a PushOver UserKey yet."
-    return 1
-  fi
-  _saveaccountconf_mutable PUSHOVER_USER "$PUSHOVER_USER"
-
-  PUSHOVER_DEVICE="${PUSHOVER_DEVICE:-$(_readaccountconf_mutable PUSHOVER_DEVICE)}"
-  if [ "$PUSHOVER_DEVICE" ]; then
-    _saveaccountconf_mutable PUSHOVER_DEVICE "$PUSHOVER_DEVICE"
-  fi
-
-  PUSHOVER_PRIORITY="${PUSHOVER_PRIORITY:-$(_readaccountconf_mutable PUSHOVER_PRIORITY)}"
-  if [ "$PUSHOVER_PRIORITY" ]; then
-    _saveaccountconf_mutable PUSHOVER_PRIORITY "$PUSHOVER_PRIORITY"
-  fi
-
-  PUSHOVER_SOUND="${PUSHOVER_SOUND:-$(_readaccountconf_mutable PUSHOVER_SOUND)}"
-  if [ "$PUSHOVER_SOUND" ]; then
-    _saveaccountconf_mutable PUSHOVER_SOUND "$PUSHOVER_SOUND"
-  fi
-
-  export _H1="Content-Type: application/json"
-  _content="$(printf "*%s*\n" "$_content" | _json_encode)"
-  _subject="$(printf "*%s*\n" "$_subject" | _json_encode)"
-  _data="{\"token\": \"$PUSHOVER_TOKEN\",\"user\": \"$PUSHOVER_USER\",\"title\": \"$_subject\",\"message\": \"$_content\",\"sound\": \"$PUSHOVER_SOUND\", \"device\": \"$PUSHOVER_DEVICE\", \"priority\": \"$PUSHOVER_PRIORITY\"}"
-
-  response="$(_post "$_data" "$PUSHOVER_URI")"
-
-  if [ "$?" = "0" ] && _contains "$response" "{\"status\":1"; then
-    _info "PUSHOVER send success."
-    return 0
-  fi
-
-  _err "PUSHOVER send error."
-  _err "$response"
-  return 1
-}
--- a/notify/sendgrid.sh
+++ b/notify/sendgrid.sh
@@ -42,13 +42,13 @@ sendgrid_send() {

  _content="$(echo "$_content" | _json_encode)"
  _data="{\"personalizations\": [{\"to\": [{\"email\": \"$SENDGRID_TO\"}]}],\"from\": {\"email\": \"$SENDGRID_FROM\"},\"subject\": \"$_subject\",\"content\": [{\"type\": \"text/plain\", \"value\": \"$_content\"}]}"
-  response="$(_post "$_data" "https://api.sendgrid.com/v3/mail/send")"
-
-  if [ "$?" = "0" ] && [ -z "$response" ]; then
-    _info "sendgrid send sccess."
-    return 0
+  response="" #just make shellcheck happy
+  if _post "$_data" "https://api.sendgrid.com/v3/mail/send"; then
+    if [ -z "$response" ]; then
+      _info "sendgrid send sccess."
+      return 0
+    fi
  fi
-
  _err "sendgrid send error."
  _err "$response"
  return 1
--- a/notify/xmpp.sh
+++ b/notify/xmpp.sh
@@ -1,90 +0,0 @@
-#!/usr/bin/env sh
-
-#Support xmpp via sendxmpp
-
-#XMPP_BIN="/usr/bin/sendxmpp"
-#XMPP_BIN_ARGS="-n -t --tls-ca-path=/etc/ssl/certs"
-#XMPP_TO="zzzz@example.com"
-
-xmpp_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_subject" "$_subject"
-  _debug "_content" "$_content"
-  _debug "_statusCode" "$_statusCode"
-
-  XMPP_BIN="${XMPP_BIN:-$(_readaccountconf_mutable XMPP_BIN)}"
-  if [ -n "$XMPP_BIN" ] && ! _exists "$XMPP_BIN"; then
-    _err "It seems that the command $XMPP_BIN is not in path."
-    return 1
-  fi
-  _XMPP_BIN=$(_xmpp_bin)
-  if [ -n "$XMPP_BIN" ]; then
-    _saveaccountconf_mutable XMPP_BIN "$XMPP_BIN"
-  else
-    _clearaccountconf "XMPP_BIN"
-  fi
-
-  XMPP_BIN_ARGS="${XMPP_BIN_ARGS:-$(_readaccountconf_mutable XMPP_BIN_ARGS)}"
-  if [ -n "$XMPP_BIN_ARGS" ]; then
-    _saveaccountconf_mutable XMPP_BIN_ARGS "$XMPP_BIN_ARGS"
-  else
-    _clearaccountconf "XMPP_BIN_ARGS"
-  fi
-
-  XMPP_TO="${XMPP_TO:-$(_readaccountconf_mutable XMPP_TO)}"
-  if [ -n "$XMPP_TO" ]; then
-    if ! _xmpp_valid "$XMPP_TO"; then
-      _err "It seems that the XMPP_TO=$XMPP_TO is not a valid xmpp address."
-      return 1
-    fi
-
-    _saveaccountconf_mutable XMPP_TO "$XMPP_TO"
-  fi
-
-  result=$({ _xmpp_message | eval "$(_xmpp_cmnd)"; } 2>&1)
-
-  # shellcheck disable=SC2181
-  if [ $? -ne 0 ]; then
-    _debug "xmpp send error."
-    _err "$result"
-    return 1
-  fi
-
-  _debug "xmpp send success."
-  return 0
-}
-
-_xmpp_bin() {
-  if [ -n "$XMPP_BIN" ]; then
-    _XMPP_BIN="$XMPP_BIN"
-  elif _exists "sendxmpp"; then
-    _XMPP_BIN="sendxmpp"
-  else
-    _err "Please install sendxmpp first."
-    return 1
-  fi
-
-  echo "$_XMPP_BIN"
-}
-
-_xmpp_cmnd() {
-  case $(basename "$_XMPP_BIN") in
-    sendxmpp)
-      echo "'$_XMPP_BIN' '$XMPP_TO' $XMPP_BIN_ARGS"
-      ;;
-    *)
-      _err "Command $XMPP_BIN is not supported, use sendxmpp."
-      return 1
-      ;;
-  esac
-}
-
-_xmpp_message() {
-  echo "$_subject"
-}
-
-_xmpp_valid() {
-  _contains "$1" "@"
-}