diff --git a/dnsapi/dns_aws.sh b/dnsapi/dns_aws.sh
deleted file mode 100755
index 71f969f0..00000000
--- a/dnsapi/dns_aws.sh
+++ /dev/null
@@ -1,279 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#AWS_ACCESS_KEY_ID="sdfsdfsdfljlbjkljlkjsdfoiwje"
-#
-#AWS_SECRET_ACCESS_KEY="xxxxxxx"
-
-#This is the Amazon Route53 api wrapper for acme.sh
-
-AWS_HOST="route53.amazonaws.com"
-AWS_URL="https://$AWS_HOST"
-
-AWS_WIKI="https://github.com/Neilpang/acme.sh/wiki/How-to-use-Amazon-Route53-API"
-
-######## Public functions #####################
-
-#Usage: dns_myapi_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_aws_add() {
- fulldomain=$1
- txtvalue=$2
-
- AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:-$(_readaccountconf_mutable AWS_ACCESS_KEY_ID)}"
- AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY:-$(_readaccountconf_mutable AWS_SECRET_ACCESS_KEY)}"
- if [ -z "$AWS_ACCESS_KEY_ID" ] || [ -z "$AWS_SECRET_ACCESS_KEY" ]; then
- AWS_ACCESS_KEY_ID=""
- AWS_SECRET_ACCESS_KEY=""
- _err "You don't specify aws route53 api key id and and api key secret yet."
- _err "Please create your key and try again. see $(__green $AWS_WIKI)"
- return 1
- fi
-
- #save for future use
- _saveaccountconf_mutable AWS_ACCESS_KEY_ID "$AWS_ACCESS_KEY_ID"
- _saveaccountconf_mutable AWS_SECRET_ACCESS_KEY "$AWS_SECRET_ACCESS_KEY"
-
- _debug "First detect the root zone"
- if ! _get_root "$fulldomain"; then
- _err "invalid domain"
- return 1
- fi
- _debug _domain_id "$_domain_id"
- _debug _sub_domain "$_sub_domain"
- _debug _domain "$_domain"
-
- _info "Geting existing records for $fulldomain"
- if ! aws_rest GET "2013-04-01$_domain_id/rrset" "name=$fulldomain&type=TXT"; then
- return 1
- fi
-
- if _contains "$response" "$fulldomain."; then
- _resource_record="$(echo "$response" | sed 's//"/g' | tr '"' "\n" | grep "$fulldomain." | _egrep_o "" | sed "s///" | sed "s###")"
- _debug "_resource_record" "$_resource_record"
- else
- _debug "single new add"
- fi
-
- if [ "$_resource_record" ] && _contains "$response" "$txtvalue"; then
- _info "The txt record already exists, skip"
- return 0
- fi
-
- _debug "Adding records"
-
- _aws_tmpl_xml="UPSERT$fulldomainTXT300$_resource_record\"$txtvalue\""
-
- if aws_rest POST "2013-04-01$_domain_id/rrset/" "" "$_aws_tmpl_xml" && _contains "$response" "ChangeResourceRecordSetsResponse"; then
- _info "txt record updated success."
- return 0
- fi
-
- return 1
-}
-
-#fulldomain txtvalue
-dns_aws_rm() {
- fulldomain=$1
- txtvalue=$2
-
- AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:-$(_readaccountconf_mutable AWS_ACCESS_KEY_ID)}"
- AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY:-$(_readaccountconf_mutable AWS_SECRET_ACCESS_KEY)}"
- _debug "First detect the root zone"
- if ! _get_root "$fulldomain"; then
- _err "invalid domain"
- return 1
- fi
- _debug _domain_id "$_domain_id"
- _debug _sub_domain "$_sub_domain"
- _debug _domain "$_domain"
-
- _info "Geting existing records for $fulldomain"
- if ! aws_rest GET "2013-04-01$_domain_id/rrset" "name=$fulldomain&type=TXT"; then
- return 1
- fi
-
- if _contains "$response" "$fulldomain."; then
- _resource_record="$(echo "$response" | sed 's//"/g' | tr '"' "\n" | grep "$fulldomain." | _egrep_o "" | sed "s///" | sed "s###")"
- _debug "_resource_record" "$_resource_record"
- else
- _debug "no records exists, skip"
- return 0
- fi
-
- _aws_tmpl_xml="DELETE$_resource_record$fulldomain.TXT300"
-
- if aws_rest POST "2013-04-01$_domain_id/rrset/" "" "$_aws_tmpl_xml" && _contains "$response" "ChangeResourceRecordSetsResponse"; then
- _info "txt record deleted success."
- return 0
- fi
-
- return 1
-
-}
-
-#################### Private functions below ##################################
-
-_get_root() {
- domain=$1
- i=2
- p=1
-
- if aws_rest GET "2013-04-01/hostedzone"; then
- while true; do
- h=$(printf "%s" "$domain" | cut -d . -f $i-100)
- _debug2 "Checking domain: $h"
- if [ -z "$h" ]; then
- if _contains "$response" "true" && _contains "$response" ""; then
- _debug "IsTruncated"
- _nextMarker="$(echo "$response" | _egrep_o ".*" | cut -d '>' -f 2 | cut -d '<' -f 1)"
- _debug "NextMarker" "$_nextMarker"
- if aws_rest GET "2013-04-01/hostedzone" "marker=$_nextMarker"; then
- _debug "Truncated request OK"
- i=2
- p=1
- continue
- else
- _err "Truncated request error."
- fi
- fi
- #not valid
- _err "Invalid domain"
- return 1
- fi
-
- if _contains "$response" "$h."; then
- hostedzone="$(echo "$response" | sed 's//#&/g' | tr '#' '\n' | _egrep_o "[^<]*<.Id>$h.<.Name>.*false<.PrivateZone>.*<.HostedZone>")"
- _debug hostedzone "$hostedzone"
- if [ "$hostedzone" ]; then
- _domain_id=$(printf "%s\n" "$hostedzone" | _egrep_o ".*<.Id>" | head -n 1 | _egrep_o ">.*<" | tr -d "<>")
- if [ "$_domain_id" ]; then
- _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
- _domain=$h
- return 0
- fi
- _err "Can not find domain id: $h"
- return 1
- fi
- fi
- p=$i
- i=$(_math "$i" + 1)
- done
- fi
- return 1
-}
-
-#method uri qstr data
-aws_rest() {
- mtd="$1"
- ep="$2"
- qsr="$3"
- data="$4"
-
- _debug mtd "$mtd"
- _debug ep "$ep"
- _debug qsr "$qsr"
- _debug data "$data"
-
- CanonicalURI="/$ep"
- _debug2 CanonicalURI "$CanonicalURI"
-
- CanonicalQueryString="$qsr"
- _debug2 CanonicalQueryString "$CanonicalQueryString"
-
- RequestDate="$(date -u +"%Y%m%dT%H%M%SZ")"
- _debug2 RequestDate "$RequestDate"
-
- #RequestDate="20161120T141056Z" ##############
-
- export _H1="x-amz-date: $RequestDate"
-
- aws_host="$AWS_HOST"
- CanonicalHeaders="host:$aws_host\nx-amz-date:$RequestDate\n"
- SignedHeaders="host;x-amz-date"
- if [ -n "$AWS_SESSION_TOKEN" ]; then
- export _H3="x-amz-security-token: $AWS_SESSION_TOKEN"
- CanonicalHeaders="${CanonicalHeaders}x-amz-security-token:$AWS_SESSION_TOKEN\n"
- SignedHeaders="${SignedHeaders};x-amz-security-token"
- fi
- _debug2 CanonicalHeaders "$CanonicalHeaders"
- _debug2 SignedHeaders "$SignedHeaders"
-
- RequestPayload="$data"
- _debug2 RequestPayload "$RequestPayload"
-
- Hash="sha256"
-
- CanonicalRequest="$mtd\n$CanonicalURI\n$CanonicalQueryString\n$CanonicalHeaders\n$SignedHeaders\n$(printf "%s" "$RequestPayload" | _digest "$Hash" hex)"
- _debug2 CanonicalRequest "$CanonicalRequest"
-
- HashedCanonicalRequest="$(printf "$CanonicalRequest%s" | _digest "$Hash" hex)"
- _debug2 HashedCanonicalRequest "$HashedCanonicalRequest"
-
- Algorithm="AWS4-HMAC-SHA256"
- _debug2 Algorithm "$Algorithm"
-
- RequestDateOnly="$(echo "$RequestDate" | cut -c 1-8)"
- _debug2 RequestDateOnly "$RequestDateOnly"
-
- Region="us-east-1"
- Service="route53"
-
- CredentialScope="$RequestDateOnly/$Region/$Service/aws4_request"
- _debug2 CredentialScope "$CredentialScope"
-
- StringToSign="$Algorithm\n$RequestDate\n$CredentialScope\n$HashedCanonicalRequest"
-
- _debug2 StringToSign "$StringToSign"
-
- kSecret="AWS4$AWS_SECRET_ACCESS_KEY"
-
- #kSecret="wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY" ############################
-
- _secure_debug2 kSecret "$kSecret"
-
- kSecretH="$(printf "%s" "$kSecret" | _hex_dump | tr -d " ")"
- _secure_debug2 kSecretH "$kSecretH"
-
- kDateH="$(printf "$RequestDateOnly%s" | _hmac "$Hash" "$kSecretH" hex)"
- _debug2 kDateH "$kDateH"
-
- kRegionH="$(printf "$Region%s" | _hmac "$Hash" "$kDateH" hex)"
- _debug2 kRegionH "$kRegionH"
-
- kServiceH="$(printf "$Service%s" | _hmac "$Hash" "$kRegionH" hex)"
- _debug2 kServiceH "$kServiceH"
-
- kSigningH="$(printf "%s" "aws4_request" | _hmac "$Hash" "$kServiceH" hex)"
- _debug2 kSigningH "$kSigningH"
-
- signature="$(printf "$StringToSign%s" | _hmac "$Hash" "$kSigningH" hex)"
- _debug2 signature "$signature"
-
- Authorization="$Algorithm Credential=$AWS_ACCESS_KEY_ID/$CredentialScope, SignedHeaders=$SignedHeaders, Signature=$signature"
- _debug2 Authorization "$Authorization"
-
- _H2="Authorization: $Authorization"
- _debug _H2 "$_H2"
-
- url="$AWS_URL/$ep"
- if [ "$qsr" ]; then
- url="$AWS_URL/$ep?$qsr"
- fi
-
- if [ "$mtd" = "GET" ]; then
- response="$(_get "$url")"
- else
- response="$(_post "$data" "$url")"
- fi
-
- _ret="$?"
- _debug2 response "$response"
- if [ "$_ret" = "0" ]; then
- if _contains "$response" "