|
|
@ -24,6 +24,7 @@ dns_dynv6_add() { |
|
|
|
_dns_dynv6_add_http |
|
|
|
return $? |
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
_get_keyfile |
|
|
|
_info "using keyfile $dynv6_keyfile" |
|
|
@ -44,6 +45,9 @@ dns_dynv6_add() { |
|
|
|
======= |
|
|
|
else |
|
|
|
>>>>>>> no supporting HTTP API as well |
|
|
|
======= |
|
|
|
else |
|
|
|
>>>>>>> formatting |
|
|
|
_info "using key file $dynv6_keyfile" |
|
|
|
_your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)" |
|
|
|
if ! _get_domain "$fulldomain" "$_your_hosts"; then |
|
|
@ -85,8 +89,12 @@ dns_dynv6_rm() { |
|
|
|
if [ "$dynv6_token" ]; then |
|
|
|
_dns_dynv6_rm_http |
|
|
|
return $? |
|
|
|
<<<<<<< HEAD |
|
|
|
else |
|
|
|
>>>>>>> no supporting HTTP API as well |
|
|
|
======= |
|
|
|
else |
|
|
|
>>>>>>> formatting |
|
|
|
_info "using key file $dynv6_keyfile" |
|
|
|
_your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)" |
|
|
|
if ! _get_domain "$fulldomain" "$_your_hosts"; then |
|
|
@ -159,6 +167,7 @@ _get_domain() { |
|
|
|
#returns |
|
|
|
#dynv6_keyfile path to the key that will be used |
|
|
|
_get_authentication() { |
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< HEAD |
|
|
|
dynv6_token="${DYNV6_TOKEN:-$(_readaccountconf_mutable dynv6_token)}" |
|
|
|
if [ "$dynv6_token" ]; then |
|
|
@ -177,6 +186,16 @@ _get_authentication() { |
|
|
|
dynv6_token="$(_readaccountconf_mutable dynv6_token)" |
|
|
|
else |
|
|
|
>>>>>>> no supporting HTTP API as well |
|
|
|
======= |
|
|
|
if [ "$DYNV6_TOKEN" ]; then |
|
|
|
_debug "Going to use the HTTP Token you specifed and saving it for futur use" |
|
|
|
_saveaccountconf_mutable dynv6_token "$DYNV6_TOKEN" |
|
|
|
dynv6_token="$DYNV6_TOKEN" |
|
|
|
elif [ "$(_readaccountconf_mutable dynv6_token)" ]; then |
|
|
|
_debug "Found a previously used HTTP token going to use that" |
|
|
|
dynv6_token="$(_readaccountconf_mutable dynv6_token)" |
|
|
|
else |
|
|
|
>>>>>>> formatting |
|
|
|
_debug "no HTTP token found. Looking for an SSH key" |
|
|
|
dynv6_keyfile="${dynv6_keyfile:-$(_readaccountconf_mutable dynv6_keyfile)}" |
|
|
|
_debug "Your key is $dynv6_keyfile" |
|
|
@ -342,8 +361,6 @@ _dynv6_rest() { |
|
|
|
fi |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_dns_dynv6_add_http() { |
|
|
|
_debug "Got HTTP token form _get_authentication method. Going to use the HTTP API" |
|
|
|
if ! _get_zone_id "$fulldomain"; then |
|
|
@ -381,7 +398,6 @@ _dns_dynv6_rm_http(){ |
|
|
|
fi |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#get the zoneid for a specifc record or zone |
|
|
|
#usage: _get_zone_id §record |
|
|
|
#where $record is the record to get the id for |
|
|
@ -492,4 +508,3 @@ _dynv6_rest() { |
|
|
|
_debug2 response "$response" |
|
|
|
return 0 |
|
|
|
} |
|
|
|
|