fix format

fix format

acme.sh

@@ -2746,6 +2746,7 @@ _clearAPI() {
   ACME_REVOKE_CERT=""
   ACME_NEW_NONCE=""
   ACME_AGREEMENT=""
+  ACME_RENEWAL_INFO=""
 }
 
 #server
@@ -2790,6 +2791,9 @@ _initAPI() {
     ACME_AGREEMENT=$(echo "$response" | _egrep_o 'termsOfService" *: *"[^"]*"' | cut -d '"' -f 3)
     export ACME_AGREEMENT
 
+    ACME_RENEWAL_INFO=$(echo "$response" | _egrep_o 'renewalInfo" *: *"[^"]*"' | cut -d '"' -f 3)
+    export ACME_RENEWAL_INFO
+
     _debug "ACME_KEY_CHANGE" "$ACME_KEY_CHANGE"
     _debug "ACME_NEW_AUTHZ" "$ACME_NEW_AUTHZ"
     _debug "ACME_NEW_ORDER" "$ACME_NEW_ORDER"
@@ -2797,6 +2801,7 @@ _initAPI() {
     _debug "ACME_REVOKE_CERT" "$ACME_REVOKE_CERT"
     _debug "ACME_AGREEMENT" "$ACME_AGREEMENT"
     _debug "ACME_NEW_NONCE" "$ACME_NEW_NONCE"
+    _debug "ACME_RENEWAL_INFO" "$ACME_RENEWAL_INFO"
     if [ "$ACME_NEW_ACCOUNT" ] && [ "$ACME_NEW_ORDER" ]; then
       return 0
     fi
@@ -6416,6 +6421,36 @@ deactivate() {
   done
 }
 
+#cert
+_getAKI() {
+  _cert="$1"
+  openssl x509 -in "$_cert" -text -noout | grep "X509v3 Authority Key Identifier" -A 1 | _tail_n 1 | tr -d ' :'
+}
+
+#cert
+_getSerial() {
+  _cert="$1"
+  openssl x509 -in "$_cert" -serial -noout | cut -d = -f 2
+}
+
+#cert
+_get_ARI() {
+  _cert="$1"
+  _aki=$(_getAKI "$_cert")
+  _ser=$(_getSerial "$_cert")
+  _debug2 "_aki" "$_aki"
+  _debug2 "_ser" "$_ser"
+
+  _akiurl="$(echo "$_aki" | _h2b | _base64 | tr -d = | _url_encode)"
+  _debug2 "_akiurl" "$_akiurl"
+  _serurl="$(echo "$_ser" | _h2b | _base64 | tr -d = | _url_encode)"
+  _debug2 "_serurl" "$_serurl"
+
+  _ARI_URL="$ACME_RENEWAL_INFO/$_akiurl.$_serurl"
+  _get "$_ARI_URL"
+
+}
+
 # Detect profile file if not specified as environment variable
 _detect_profile() {
   if [ -n "$PROFILE" -a -f "$PROFILE" ]; then

deploy/truenas.sh

@@ -217,7 +217,7 @@ truenas_deploy() {
           _app_id=$(echo "$_app_id_list" | sed -n "${i}p")
           _app_config="$(_post "\"$_app_id\"" "$_api_url/app/config" "" "POST" "application/json")"
           # Check if the app use the same certificate TrueNAS web UI
-          _app_active_cert_config=$(echo "$_app_config" | tr -d '\000-\037' | _json_decode | jq -r ".ix_certificates[\"$_active_cert_id\"]")
+          _app_active_cert_config=$(echo "$_app_config" | _json_decode | jq -r ".ix_certificates[\"$_active_cert_id\"]")
           if [ "$_app_active_cert_config" != "null" ]; then
             _info "Updating certificate from $_active_cert_id to $_cert_id for app: $_app_id"
             #Replace the old certificate id with the new one in path

deploy/unifi.sh

@@ -135,36 +135,20 @@ unifi_deploy() {
       cp -f "$_import_pkcs12" "$_unifi_keystore"
     fi
 
-    # correct file ownership according to the directory, the keystore is placed in
-    _unifi_keystore_dir=$(dirname "${_unifi_keystore}")
-    _unifi_keystore_dir_owner=$(find "${_unifi_keystore_dir}" -maxdepth 0 -printf '%u\n')
-    _unifi_keystore_owner=$(find "${_unifi_keystore}" -maxdepth 0 -printf '%u\n')
-    if ! [ "${_unifi_keystore_owner}" = "${_unifi_keystore_dir_owner}" ]; then
-      _debug "Changing keystore owner to ${_unifi_keystore_dir_owner}"
-      chown "$_unifi_keystore_dir_owner" "${_unifi_keystore}" >/dev/null 2>&1 # fail quietly if we're not running as root
-    fi
-
     # Update unifi service for certificate cipher compatibility
     if ${ACME_OPENSSL_BIN:-openssl} pkcs12 \
       -in "$_import_pkcs12" \
       -password pass:aircontrolenterprise \
       -nokeys | ${ACME_OPENSSL_BIN:-openssl} x509 -text \
       -noout | grep -i "signature" | grep -iq ecdsa >/dev/null 2>&1; then
-      if [ -f "$(dirname "${DEPLOY_UNIFI_KEYSTORE}")/system.properties" ]; then
-        _unifi_system_properties="$(dirname "${DEPLOY_UNIFI_KEYSTORE}")/system.properties"
-      else
-        _unifi_system_properties="/usr/lib/unifi/data/system.properties"
-      fi
-      if [ -f "${_unifi_system_properties}" ]; then
-        cp -f "${_unifi_system_properties}" "${_unifi_system_properties}"_original
-        _info "Updating system configuration for cipher compatibility."
-        _info "Saved original system config to ${_unifi_system_properties}_original"
-        sed -i '/unifi\.https\.ciphers/d' "${_unifi_system_properties}"
-        echo "unifi.https.ciphers=ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES128-GCM-SHA256" >>"${_unifi_system_properties}"
-        sed -i '/unifi\.https\.sslEnabledProtocols/d' "${_unifi_system_properties}"
-        echo "unifi.https.sslEnabledProtocols=TLSv1.3,TLSv1.2" >>"${_unifi_system_properties}"
-        _info "System configuration updated."
-      fi
+      cp -f /usr/lib/unifi/data/system.properties /usr/lib/unifi/data/system.properties_original
+      _info "Updating system configuration for cipher compatibility."
+      _info "Saved original system config to /usr/lib/unifi/data/system.properties_original"
+      sed -i '/unifi\.https\.ciphers/d' /usr/lib/unifi/data/system.properties
+      echo "unifi.https.ciphers=ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES128-GCM-SHA256" >>/usr/lib/unifi/data/system.properties
+      sed -i '/unifi\.https\.sslEnabledProtocols/d' /usr/lib/unifi/data/system.properties
+      echo "unifi.https.sslEnabledProtocols=TLSv1.3,TLSv1.2" >>/usr/lib/unifi/data/system.properties
+      _info "System configuration updated."
     fi
 
     rm "$_import_pkcs12"

dnsapi/dns_anikeen.sh

@@ -1,151 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-
-dns_anikeen_info='Anikeen Cloud
-Site: Anikeen.cloud
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_anikeen
-Options:
- ANIKEEN_API_KEY API Key
-Issues: github.com/acmesh-official/acme.sh/issues/6175
-Author: Maurice Preuß <maurice@anikeen.com>
-'
-
-### Public functions
-
-# Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to add txt record
-dns_anikeen_add() {
-  fulldomain="$1"
-  txtvalue="$2"
-
-  _info "Using Anikeen Cloud API to add TXT record"
-
-  _check_anikeen_api_key || return 1
-
-  _debug "Finding zone for domain: $fulldomain"
-  _anikeen_find_zone "$fulldomain"
-  if [ -z "$_domain_id" ]; then
-    _err "Domain not found in Anikeen Cloud API"
-    return 1
-  fi
-
-  _debug "Adding TXT record"
-  _anikeen_add_record "$_domain_id" "$fulldomain" "TXT" "$txtvalue"
-}
-
-# Usage: fulldomain txtvalue
-# Used to remove the txt record after validation
-dns_anikeen_rm() {
-  fulldomain="$1"
-  txtvalue="$2"
-
-  _info "Using Anikeen Cloud API to remove TXT record"
-
-  _check_anikeen_api_key || return 1
-
-  _debug "Finding zone for domain: $fulldomain"
-  _anikeen_find_zone "$fulldomain"
-  if [ -z "$_domain_id" ]; then
-    _err "Domain not found in Anikeen Cloud API"
-    return 1
-  fi
-
-  _debug "Removing TXT record"
-  _anikeen_delete_record "$_domain_id" "$fulldomain" "TXT" "$txtvalue"
-}
-
-###  Private functions
-
-_check_anikeen_api_key() {
-  ANIKEEN_API_KEY="${ANIKEEN_API_KEY:-$(_readaccountconf_mutable ANIKEEN_API_KEY)}"
-  if [ -z "$ANIKEEN_API_KEY" ]; then
-    ANIKEEN_API_KEY=""
-    _err "You don't specify the Anikeen Cloud api key yet."
-    _err "Please create your key and try again."
-    return 1
-  fi
-
-  # save the credentials to the account conf file
-  _saveaccountconf_mutable ANIKEEN_API_KEY "$ANIKEEN_API_KEY"
-
-  _debug "API Key is set"
-
-  export _H1="Accept: application/json"
-  export _H1="Content-Type: application/json"
-  export _H2="Authorization: Bearer $ANIKEEN_API_KEY"
-
-  _debug "Headers set"
-}
-
-_anikeen_find_zone() {
-  domain="$1"
-
-  while [ -n "$domain" ]; do
-    _debug2 "Finding zone for domain: $domain"
-
-    response=$(_get "https://api.anikeen.cloud/v1/zones?name=$domain")
-    _debug2 response "$response"
-
-    if echo "$response" | grep -q '"data"'; then
-      _domain_id=$(echo "$response" | _egrep_o '"data":\[\{"id":"[a-zA-Z0-9]*"' | _egrep_o '[a-zA-Z0-9]{26}')
-
-      if [ -n "$_domain_id" ]; then
-        _info "Using zone $_domain_id for domain $domain"
-        return 0
-      fi
-    fi
-
-    domain="${domain#*.}"
-  done
-
-  _err "No matching zone found for domain $1"
-  return 1
-}
-
-_anikeen_add_record() {
-  domain_id="$1"
-  name="$2"
-  type="$3"
-  content="$4"
-
-  data="{\"name\":\"$name\",\"type\":\"$type\",\"content\":\"\\\"$content\\\"\",\"ttl\":300,\"prio\":0}"
-  response=$(_post "$data" "https://api.anikeen.cloud/v1/zones/$domain_id/records" "", "POST")
-
-  if [ "$?" != "0" ]; then
-    _err "Failed to add record: $response"
-    return 1
-  fi
-
-  _debug2 response "$response"
-
-  _info "TXT record added successfully"
-}
-
-_anikeen_delete_record() {
-  domain_id="$1"
-  name="$2"
-  type="$3"
-  content="$4"
-
-  response=$(_get "https://api.anikeen.cloud/v1/zones/$domain_id/records?name=$name&type=$type&content=\"$content\"")
-
-  _debug2 response "$response"
-
-  record_id=$(echo "$response" | _egrep_o '"data":\[\{"id":[0-9]*' | _egrep_o '[0-9]*')
-
-  if [ -z "$record_id" ]; then
-    _err "Record not found"
-    return 1
-  fi
-
-  response=$(_post "", "https://api.anikeen.cloud/v1/zones/$domain_id/records/$record_id", "", "DELETE")
-
-  if [ "$?" != "0" ]; then
-    _err "Failed to delete record: $response"
-    return 1
-  fi
-
-  _debug2 response "$response"
-
-  _info "TXT record removed successfully"
-}

dnsapi/dns_azure.sh

@@ -9,7 +9,7 @@ Options:
  AZUREDNS_APPID App ID. App ID of the service principal
  AZUREDNS_CLIENTSECRET Client Secret. Secret from creating the service principal
  AZUREDNS_MANAGEDIDENTITY Use Managed Identity. Use Managed Identity assigned to a resource instead of a service principal. "true"/"false"
- AZUREDNS_BEARERTOKEN Bearer Token. Used instead of service principal credentials or managed identity. Optional.
+ AZUREDNS_BEARERTOKEN Optional Bearer Token. Used instead of service principal credentials or managed identity
 '
 
 wiki=https://github.com/acmesh-official/acme.sh/wiki/How-to-use-Azure-DNS

dnsapi/dns_cyon.sh

@@ -215,8 +215,10 @@ _cyon_change_domain_env() {
 
   if ! _cyon_check_if_2fa_missed "${domain_env_response}"; then return 1; fi
 
+  domain_env_success="$(printf "%s" "${domain_env_response}" | _egrep_o '"authenticated":\w*' | cut -d : -f 2)"
+
   # Bail if domain environment change fails.
-  if [ "$(printf "%s" "${domain_env_response}" | _cyon_get_environment_change_status)" != "true" ]; then
+  if [ "${domain_env_success}" != "true" ]; then
     _err "    $(printf "%s" "${domain_env_response}" | _cyon_get_response_message)"
     _err ""
     return 1
@@ -230,7 +232,7 @@ _cyon_add_txt() {
   _info "  - Adding DNS TXT entry..."
 
   add_txt_url="https://my.cyon.ch/domain/dnseditor/add-record-async"
-  add_txt_data="name=${fulldomain_idn}.&ttl=900&type=TXT&dnscontent=${txtvalue}"
+  add_txt_data="zone=${fulldomain_idn}.&ttl=900&type=TXT&value=${txtvalue}"
 
   add_txt_response="$(_post "$add_txt_data" "$add_txt_url")"
   _debug add_txt_response "${add_txt_response}"
@@ -239,10 +241,9 @@ _cyon_add_txt() {
 
   add_txt_message="$(printf "%s" "${add_txt_response}" | _cyon_get_response_message)"
   add_txt_status="$(printf "%s" "${add_txt_response}" | _cyon_get_response_status)"
-  add_txt_validation="$(printf "%s" "${add_txt_response}" | _cyon_get_validation_status)"
 
   # Bail if adding TXT entry fails.
-  if [ "${add_txt_status}" != "true" ] || [ "${add_txt_validation}" != "true" ]; then
+  if [ "${add_txt_status}" != "true" ]; then
     _err "    ${add_txt_message}"
     _err ""
     return 1
@@ -304,21 +305,13 @@ _cyon_get_response_message() {
 }
 
 _cyon_get_response_status() {
-  _egrep_o '"status":[a-zA-z0-9]*' | cut -d : -f 2
-}
-
-_cyon_get_validation_status() {
-  _egrep_o '"valid":[a-zA-z0-9]*' | cut -d : -f 2
+  _egrep_o '"status":\w*' | cut -d : -f 2
 }
 
 _cyon_get_response_success() {
   _egrep_o '"onSuccess":"[^"]*"' | cut -d : -f 2 | tr -d '"'
 }
 
-_cyon_get_environment_change_status() {
-  _egrep_o '"authenticated":[a-zA-z0-9]*' | cut -d : -f 2
-}
-
 _cyon_check_if_2fa_missed() {
   # Did we miss the 2FA?
   if test "${1#*multi_factor_form}" != "${1}"; then

dnsapi/dns_limacity.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_limacity_info='lima-city.de
-Site: www.lima-city.de
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_limacity
-Options:
- LIMACITY_APIKEY API Key. Note: The API Key must have following roles: dns.admin, domains.reader
-Issues: github.com/acmesh-official/acme.sh/issues/4758
-Author: @Laraveluser
-'
+
+# Created by Laraveluser
+#
+# Pass credentials before "acme.sh --issue --dns dns_limacity ..."
+# --
+# export LIMACITY_APIKEY="<API-KEY>"
+# --
+#
+# Pleas note: APIKEY must have following roles: dns.admin, domains.reader
 
 ########  Public functions #####################
 

dnsapi/dns_mijnhost.sh

@@ -1,215 +0,0 @@
-#!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_mijnhost_info='mijn.host
-Domains: mijn.host
-Site: mijn.host
-Docs: https://mijn.host/api/doc/
-Issues: https://github.com/acmesh-official/acme.sh/issues/6177
-Author: peterv99
-Options:
- MIJNHOST_API_KEY API Key
-'
-
-########  Public functions ###################### Constants for your mijn-host API
-MIJNHOST_API="https://mijn.host/api/v2"
-
-# Add TXT record for domain verification
-dns_mijnhost_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  MIJNHOST_API_KEY="${MIJNHOST_API_KEY:-$(_readaccountconf_mutable MIJNHOST_API_KEY)}"
-  if [ -z "$MIJNHOST_API_KEY" ]; then
-    MIJNHOST_API_KEY=""
-    _err "You haven't specified your mijn-host API key yet."
-    _err "Please add MIJNHOST_API_KEY to the env."
-    return 1
-  fi
-
-  # Save the API key for future use
-  _saveaccountconf_mutable MIJNHOST_API_KEY "$MIJNHOST_API_KEY"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-
-  _debug2 _sub_domain "$_sub_domain"
-  _debug2 _domain "$_domain"
-  _debug "Adding DNS record" "${fulldomain}."
-
-  # Construct the API URL
-  api_url="$MIJNHOST_API/domains/$_domain/dns"
-
-  # Getting previous records
-  _mijnhost_rest GET "$api_url" ""
-
-  if [ "$_code" != "200" ]; then
-    _err "Error getting current DNS enties ($_code)"
-    return 1
-  fi
-
-  records=$(echo "$response" | _egrep_o '"records":\[.*\]' | sed 's/"records"://')
-
-  _debug2 "Current records" "$records"
-
-  # Build the payload for the API
-  data="{\"type\":\"TXT\",\"name\":\"$fulldomain.\",\"value\":\"$txtvalue\",\"ttl\":300}"
-
-  _debug2 "Record to add" "$data"
-
-  # Updating the records
-  updated_records=$(echo "$records" | sed -E "s/\]( *$)/,$data\]/")
-
-  _debug2 "Updated records" "$updated_records"
-
-  # data
-  data="{\"records\": $updated_records}"
-
-  _mijnhost_rest PUT "$api_url" "$data"
-
-  if [ "$_code" = "200" ]; then
-    _info "DNS record succesfully added."
-    return 0
-  else
-    _err "Error adding DNS record ($_code)."
-    return 1
-  fi
-}
-
-# Remove TXT record after verification
-dns_mijnhost_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  MIJNHOST_API_KEY="${MIJNHOST_API_KEY:-$(_readaccountconf_mutable MIJNHOST_API_KEY)}"
-  if [ -z "$MIJNHOST_API_KEY" ]; then
-    MIJNHOST_API_KEY=""
-    _err "You haven't specified your mijn-host API key yet."
-    _err "Please add MIJNHOST_API_KEY to the env."
-    return 1
-  fi
-
-  _debug "Detecting root zone for" "${fulldomain}."
-  if ! _get_root "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-
-  _debug "Removing DNS record for TXT value" "${txtvalue}."
-
-  # Construct the API URL
-  api_url="$MIJNHOST_API/domains/$_domain/dns"
-
-  # Get current records
-  _mijnhost_rest GET "$api_url" ""
-
-  if [ "$_code" != "200" ]; then
-    _err "Error getting current DNS enties ($_code)"
-    return 1
-  fi
-
-  _debug2 "Get current records response:" "$response"
-
-  records=$(echo "$response" | _egrep_o '"records":\[.*\]' | sed 's/"records"://')
-
-  _debug2 "Current records:" "$records"
-
-  updated_records=$(echo "$records" | sed -E "s/\{[^}]*\"value\":\"$txtvalue\"[^}]*\},?//g" | sed 's/,]/]/g')
-
-  _debug2 "Updated records:" "$updated_records"
-
-  # Build the new payload
-  data="{\"records\": $updated_records}"
-
-  # Use the _put method to update the records
-  _mijnhost_rest PUT "$api_url" "$data"
-
-  if [ "$_code" = "200" ]; then
-    _info "DNS record removed successfully."
-    return 0
-  else
-    _err "Error removing DNS record ($_code)."
-    return 1
-  fi
-}
-
-# Helper function to detect the root zone
-_get_root() {
-  domain=$1
-
-  # Get current records
-  _debug "Getting current domains"
-  _mijnhost_rest GET "$MIJNHOST_API/domains" ""
-
-  if [ "$_code" != "200" ]; then
-    _err "error getting current domains ($_code)"
-    return 1
-  fi
-
-  # Extract root domains from response
-  rootDomains=$(echo "$response" | _egrep_o '"domain":"[^"]*"' | sed -E 's/"domain":"([^"]*)"/\1/')
-  _debug "Root domains:" "$rootDomains"
-
-  for rootDomain in $rootDomains; do
-    if _contains "$domain" "$rootDomain"; then
-      _domain="$rootDomain"
-      _sub_domain=$(echo "$domain" | sed "s/.$rootDomain//g")
-      _debug "Found root domain" "$_domain" "and subdomain" "$_sub_domain" "for" "$domain"
-      return 0
-    fi
-  done
-  return 1
-}
-
-# Helper function for rest calls
-_mijnhost_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-
-  MAX_REQUEST_RETRY_TIMES=15
-  _request_retry_times=0
-  _retry_sleep=5 #Initial sleep time in seconds.
-
-  while [ "${_request_retry_times}" -lt "$MAX_REQUEST_RETRY_TIMES" ]; do
-    _debug2 _request_retry_times "$_request_retry_times"
-    export _H1="API-Key: $MIJNHOST_API_KEY"
-    export _H2="Content-Type: application/json"
-    # clear headers from previous request to avoid getting wrong http code on timeouts
-    : >"$HTTP_HEADER"
-    _debug "$ep"
-    if [ "$m" != "GET" ]; then
-      _debug2 "data $data"
-      response="$(_post "$data" "$ep" "" "$m")"
-    else
-      response="$(_get "$ep")"
-    fi
-    _ret="$?"
-    _debug2 "response $response"
-    _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-    _debug "http response code $_code"
-    if [ "$_code" = "401" ]; then
-      # we have an invalid API token, maybe it is expired?
-      _err "Access denied. Invalid API token."
-      return 1
-    fi
-
-    if [ "$_ret" != "0" ] || [ -z "$_code" ] || [ "$_code" = "400" ] || _contains "$response" "DNS records not managed by mijn.host"; then #Sometimes API errors out
-      _request_retry_times="$(_math "$_request_retry_times" + 1)"
-      _info "REST call error $_code retrying $ep in ${_retry_sleep}s"
-      _sleep "$_retry_sleep"
-      _retry_sleep="$(_math "$_retry_sleep" \* 2)"
-      continue
-    fi
-    break
-  done
-  if [ "$_request_retry_times" = "$MAX_REQUEST_RETRY_TIMES" ]; then
-    _err "Error mijn.host API call was retried $MAX_REQUEST_RETRY_TIMES times."
-    _err "Calling $ep failed."
-    return 1
-  fi
-  response="$(echo "$response" | _normalizeJson)"
-  return 0
-}

dnsapi/dns_myapi.sh

@@ -1,14 +1,12 @@
 #!/usr/bin/env sh
 # shellcheck disable=SC2034
 dns_myapi_info='Custom API Example
- A sample custom DNS API script description.
-Domains: example.com example.net
+ A sample custom DNS API script.
+Domains: example.com
 Site: github.com/acmesh-official/acme.sh/wiki/DNS-API-Dev-Guide
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_myapi
+Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_duckdns
 Options:
- MYAPI_Token API Token. Get API Token from https://example.com/api/
- MYAPI_Variable2 Option 2. Default "default value".
- MYAPI_Variable2 Option 3. Optional.
+ MYAPI_Token API Token. Get API Token from https://example.com/api/. Optional.
 Issues: github.com/acmesh-official/acme.sh
 Author: Neil Pang <neilgit@neilpang.com>
 '

dnsapi/dns_netcup.sh

@@ -19,7 +19,7 @@ client=""
 
 dns_netcup_add() {
   _debug NC_Apikey "$NC_Apikey"
-  _login
+  login
   if [ "$NC_Apikey" = "" ] || [ "$NC_Apipw" = "" ] || [ "$NC_CID" = "" ]; then
     _err "No Credentials given"
     return 1
@@ -61,7 +61,7 @@ dns_netcup_add() {
 }
 
 dns_netcup_rm() {
-  _login
+  login
   fulldomain=$1
   txtvalue=$2
 
@@ -125,7 +125,7 @@ dns_netcup_rm() {
   logout
 }
 
-_login() {
+login() {
   tmp=$(_post "{\"action\": \"login\", \"param\": {\"apikey\": \"$NC_Apikey\", \"apipassword\": \"$NC_Apipw\", \"customernumber\": \"$NC_CID\"}}" "$end" "" "POST")
   sid=$(echo "$tmp" | tr '{}' '\n' | grep apisessionid | cut -d '"' -f 4)
   _debug "$tmp"

dnsapi/dns_omglol.sh

@@ -4,8 +4,8 @@ dns_omglol_info='omg.lol
 Site: omg.lol
 Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_omglol
 Options:
- OMG_ApiKey API Key. This is accessible from the bottom of the account page at https://home.omg.lol/account
- OMG_Address Address. This is your omg.lol address, without the preceding @ - you can see your list on your dashboard at https://home.omg.lol/dashboard
+ OMG_ApiKey API Key from omg.lol. This is accessible from the bottom of the account page at https://home.omg.lol/account
+ OMG_Address This is your omg.lol address, without the preceding @ - you can see your list on your dashboard at https://home.omg.lol/dashboard
 Issues: github.com/acmesh-official/acme.sh/issues/5299
 Author: @Kholin <kholin+acme.omglolapi@omg.lol>
 '

dnsapi/dns_openprovider.sh

@@ -2,7 +2,6 @@
 # shellcheck disable=SC2034
 dns_openprovider_info='OpenProvider.eu
 Site: OpenProvider.eu
-Domains: OpenProvider.com
 Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi#dns_openprovider
 Options:
  OPENPROVIDER_USER Username

dnsapi/dns_pdns.sh

@@ -7,7 +7,7 @@ Options:
  PDNS_Url API URL. E.g. "http://ns.example.com:8081"
  PDNS_ServerId Server ID. E.g. "localhost"
  PDNS_Token API Token
- PDNS_Ttl Domain TTL. Default: "60".
+ PDNS_Ttl=60 Domain TTL. Default: "60".
 '
 
 DEFAULT_PDNS_TTL=60

dnsapi/dns_technitium.sh

@@ -1,12 +1,13 @@
 #!/usr/bin/env sh
 # shellcheck disable=SC2034
-dns_technitium_info='Technitium DNS Server
-Site: Technitium.com/dns/
+dns_Technitium_info='Technitium DNS Server
+
+Site: https://technitium.com/dns/
 Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_technitium
 Options:
  Technitium_Server Server Address
  Technitium_Token API Token
-Issues: github.com/acmesh-official/acme.sh/issues/6116
+Issues:https://github.com/acmesh-official/acme.sh/issues/6116
 Author: Henning Reich <acmesh@qupfer.de>
 '
 

dnsapi/dns_west_cn.sh

@@ -1,13 +1,9 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_west_cn_info='West.cn
-Site: West.cn
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_west_cn
-Options:
- WEST_Username API username
- WEST_Key API Key. Set at https://www.west.cn/manager/API/APIconfig.asp
-Issues: github.com/acmesh-official/acme.sh/issues/4894
-'
+
+# West.cn Domain api
+#WEST_Username="username"
+#WEST_Key="sADDsdasdgdsf"
+#Set key at https://www.west.cn/manager/API/APIconfig.asp
 
 REST_API="https://api.west.cn/API/v2"
 

dnsapi/dns_yandex360.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 # shellcheck disable=SC2034
 dns_yandex360_info='Yandex 360 for Business DNS API.
- Yandex 360 for Business is a digital environment for effective collaboration.
+Yandex 360 for Business is a digital environment for effective collaboration.
 Site: https://360.yandex.com/
 Docs: https://github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_yandex360
 Options:

dnsapi/dns_zoneedit.sh

@@ -1,23 +1,19 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC2034
-dns_zoneedit_info='ZoneEdit.com
-Site: ZoneEdit.com
-Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_zoneedit
-Options:
- ZONEEDIT_ID ID
- ZONEEDIT_Token API Token
-Issues: github.com/acmesh-official/acme.sh/issues/6135
-'
 
 # https://github.com/blueslow/sslcertzoneedit
 
+# Only need to export the credentials once, acme.sh will save for automatic renewal.
+# export ZONEEDIT_ID="Your id"
+# export ZONEEDIT_Token="Your token"
+# acme.sh --issue --dns dns_zoneedit -d example.com -d www.example.com
+
 ########  Public functions #####################
 
 # Usage: dns_zoneedit_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_zoneedit_add() {
   fulldomain=$1
   txtvalue=$2
-  _info "Using ZoneEdit"
+  _info "Using Zoneedit"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
 
@@ -49,7 +45,7 @@ dns_zoneedit_add() {
 dns_zoneedit_rm() {
   fulldomain=$1
   txtvalue=$2
-  _info "Using ZoneEdit"
+  _info "Using Zoneedit"
   _debug fulldomain "$fulldomain"
   _debug txtvalue "$txtvalue"
 
@@ -118,7 +114,7 @@ _zoneedit_api() {
       if [ "$ze_sleep" ]; then _sleep "$ze_sleep"; fi
       return 0
     elif _contains "$response" "ERROR.*Minimum.*seconds"; then
-      _info "ZoneEdit responded with a rate limit of..."
+      _info "Zoneedit responded with a rate limit of..."
       ze_ratelimit=$(echo "$response" | sed -n 's/.*Minimum \([0-9]\+\) seconds.*/\1/p')
       if [ "$ze_ratelimit" ] && [ ! "$(echo "$ze_ratelimit" | tr -d '0-9')" ]; then
         _info "$ze_ratelimit seconds."

notify/aws_ses.sh

@@ -89,7 +89,7 @@ _use_metadata() {
       _normalizeJson |
       tr '{,}' '\n' |
       while read -r _line; do
-        _key="$(echo "${_line%%:*}" | tr -d \")"
+        _key="$(echo "${_line%%:*}" | tr -d '"')"
         _value="${_line#*:}"
         _debug3 "_key" "$_key"
         _secure_debug3 "_value" "$_value"