Merge pull request #22 from lawtancool/master

Fix breakage when there are multiple DNS records for a single subdomain
This commit is contained in:
Alper Kanat 2021-07-09 01:11:26 +03:00 committed by GitHub
commit 9d6d48e00d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions

View file

@ -16,6 +16,7 @@ Pick one of the options below using the following settings:
* **DOMAIN:** The domain your subdomain is registered at. (i.e. `foo.com` for `home.foo.com`) * **DOMAIN:** The domain your subdomain is registered at. (i.e. `foo.com` for `home.foo.com`)
* **NAME:** Subdomain to use. (name in A record) (i.e. `home` for `home.foo.com`). Multiple subdomains must be separated by semicolons `;` * **NAME:** Subdomain to use. (name in A record) (i.e. `home` for `home.foo.com`). Multiple subdomains must be separated by semicolons `;`
* **SLEEP_INTERVAL:** Polling time in seconds. (default: 300) * **SLEEP_INTERVAL:** Polling time in seconds. (default: 300)
* **REMOVE_DUPLICATES:** If set to `"true"`, removes extra DNS records if more than one A record is found on a subdomain. *Note that if this is not enabled, the script will NOT update subdomains with more than one A record* (default: false)
### Docker (Recommended) ### Docker (Recommended)
@ -26,6 +27,7 @@ $ docker run -d --name dyndns \
-e DOMAIN="yourdomain.com" \ -e DOMAIN="yourdomain.com" \
-e NAME="subdomain" \ -e NAME="subdomain" \
-e SLEEP_INTERVAL=2 \ -e SLEEP_INTERVAL=2 \
-e REMOVE_DUPLICATES="true" \
tunix/digitalocean-dyndns tunix/digitalocean-dyndns
``` ```

View file

@ -2,6 +2,7 @@
api_host="https://api.digitalocean.com/v2" api_host="https://api.digitalocean.com/v2"
sleep_interval=${SLEEP_INTERVAL:-300} sleep_interval=${SLEEP_INTERVAL:-300}
remove_duplicates=${REMOVE_DUPLICATES:-"false"}
services=( services=(
"ifconfig.co" "ifconfig.co"
@ -33,20 +34,39 @@ while ( true ); do
ip="$(curl -s $service | grep '[0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{3\}')" ip="$(curl -s $service | grep '[0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{3\}')"
test -n "$ip" && break test -n "$ip" && break
done done
echo "Found IP address $ip" echo "Found IP address $ip"
if [[ -n $ip ]]; then if [[ -n $ip ]]; then
# disable glob expansion # disable glob expansion
set -f set -f
for sub in ${NAME//;/ }; do for sub in ${NAME//;/ }; do
record_id=$(echo $domain_records| jq ".domain_records[] | select(.type == \"A\" and .name == \"$sub\") | .id") record_id=$(echo $domain_records| jq ".domain_records[] | select(.type == \"A\" and .name == \"$sub\") | .id")
record_data=$(echo $domain_records| jq -r ".domain_records[] | select(.type == \"A\" and .name == \"$sub\") | .data") record_data=$(echo $domain_records| jq -r ".domain_records[] | select(.type == \"A\" and .name == \"$sub\") | .data")
if [ $(echo "$record_id" | wc -l) -ge 2 ]; then :
if [[ "${remove_duplicates}" == "true" ]]; then :
echo "'$sub' domain name has duplicate DNS records, removing duplicates"
record_id_to_delete=$(echo "$record_id"| tail -n +2)
record_id=$(echo "$record_id"| head -1)
record_data=$(echo "$record_data"| head -1)
while IFS= read -r line; do
curl -s -X DELETE \
-H "Content-Type: application/json" \
-H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \
"$dns_list/$line" &> /dev/null
done <<< "$record_id_to_delete"
else :
echo "Unable to update '$sub' domain name as it has duplicate DNS records. Set REMOVE_DUPLICATES='true' to remove them."
continue
fi
fi
# re-enable glob expansion # re-enable glob expansion
set +f set +f
data="{\"type\": \"A\", \"name\": \"$sub\", \"data\": \"$ip\"}" data="{\"type\": \"A\", \"name\": \"$sub\", \"data\": \"$ip\"}"
url="$dns_list/$record_id" url="$dns_list/$record_id"