From b2cb736419922a841ec39f562352f673e1a7f33f Mon Sep 17 00:00:00 2001 From: "Jason D. McCormick" Date: Thu, 2 Mar 2017 21:18:08 -0500 Subject: [PATCH 1/3] revert parsing of config field for region --- src/etc/inc/dyndns.class | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index af85113445..408c738363 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -650,10 +650,9 @@ case 'route53': require_once("r53.class"); $r53 = new Route53($this->_dnsUser, $this->_dnsPass); - list($r53_regionId, $r53_zoneId) = split('/', $this->_dnsZoneID); - $apiurl = $r53->getApiUrl($r53_zoneId); + $apiurl = $r53->getApiUrl($this->_dnsZoneID); $xmlreq = $r53->getRequestBody($this->_dnsHost, $this->_dnsIP, $this->_dnsTTL); - $httphead = $r53->getHttpPostHeaders($r53_zoneId, $r53_regionId, hash("sha256",$xmlreq)); + $httphead = $r53->getHttpPostHeaders($r53_zoneId, "us-east-1", hash("sha256",$xmlreq)); curl_setopt($ch, CURLOPT_HTTPHEADER, $httphead); if($this->_dnsVerboseLog){ log_error(sprintf("Sending reuquest to: %s", $apiurl)); From c06d14488b4b045d041a3002ca44d96c9ed4a118 Mon Sep 17 00:00:00 2001 From: "Jason D. McCormick" Date: Thu, 2 Mar 2017 21:19:30 -0500 Subject: [PATCH 2/3] Revert addition of region to zone field --- src/usr/local/www/services_dyndns_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index acff97f8bf..e8333516ba 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -370,7 +370,7 @@ $section->addInput(new Form_Input( 'Zone ID', 'text', $pconfig['zoneid'] -))->setHelp('Route53: Enter AWS Region and Zone ID in the form REGION/ZONEID (example: "us-east-1/A1B2C3D4E5F6Z").%1$s' . +))->setHelp('Route53: Enter AWS Zone ID.%1$s' . 'DNSimple: Enter the Record ID of record to update.', '
'); $section->addInput(new Form_Input( From 566324432cccf156fb0f4ddcb9993028bac5489c Mon Sep 17 00:00:00 2001 From: "Jason D. McCormick" Date: Fri, 3 Mar 2017 20:47:30 -0500 Subject: [PATCH 3/3] use right var for zoneid --- src/etc/inc/dyndns.class | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index 408c738363..89f4075a7b 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -652,7 +652,7 @@ $r53 = new Route53($this->_dnsUser, $this->_dnsPass); $apiurl = $r53->getApiUrl($this->_dnsZoneID); $xmlreq = $r53->getRequestBody($this->_dnsHost, $this->_dnsIP, $this->_dnsTTL); - $httphead = $r53->getHttpPostHeaders($r53_zoneId, "us-east-1", hash("sha256",$xmlreq)); + $httphead = $r53->getHttpPostHeaders($this->_dnsZoneID, "us-east-1", hash("sha256",$xmlreq)); curl_setopt($ch, CURLOPT_HTTPHEADER, $httphead); if($this->_dnsVerboseLog){ log_error(sprintf("Sending reuquest to: %s", $apiurl));