Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #16430 from LecrisUT/improve-gandi

Browse source 
ddns-scripts: better error management for gandi
This commit is contained in:
Florian Eckert 2021-09-03 10:49:48 +02:00 committed by GitHub
commit c663b159c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ddns-scripts/Makefile
View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts PKG_NAME:=ddns-scripts
PKG_VERSION:=2.8.2 PKG_VERSION:=2.8.2
PKG_RELEASE:=12 PKG_RELEASE:=13
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

27
net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh
View file

@ -1,19 +1,38 @@
#!/bin/sh #!/bin/sh
# Thanks goes to Alex Griffin who provided this script. # Thanks goes to Alex Griffin who provided this script.
. /usr/share/libubox/jshn.sh
local __TTL=600 local __TTL=600
local __RRTYPE local __RRTYPE
local __ENDPOINT="https://dns.api.gandi.net/api/v5" local __ENDPOINT="https://api.gandi.net/v5/livedns"
local __STATUS
[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing subdomain as 'username'" [ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing subdomain as 'username'"
[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing API Key as 'password'" [ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing API Key as 'password'"
[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A" [ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
curl -s -X PUT "$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE" \ # Construct JSON payload
-H "X-Api-Key: $password" \ json_init
json_add_int rrset_ttl "$__TTL"
json_add_array rrset_values
json_add_string "" "$__IP"
json_close_array
__STATUS=$(curl -s -X PUT "$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE" \
-H "Authorization: Apikey $password" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d "{\"rrset_ttl\": $__TTL, \"rrset_values\": [\"$__IP\"]}" >$DATFILE -d "$(json_dump)" \
-w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
if [ $? -ne 0 ]; then
write_log 14 "Curl failed: $(cat $ERRFILE)"
return 1
elif [ -z $__STATUS ] || [ $__STATUS != 201 ]; then
write_log 14 "LiveDNS failed: $__STATUS \ngandi.net answered: $(cat $DATFILE)"
return 1
fi
write_log 7 "gandi.net answered: $(cat $DATFILE)" write_log 7 "gandi.net answered: $(cat $DATFILE)"