diff options
| author | jim-p <jimp@pfsense.org> | 2017-04-03 14:49:20 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-04-03 14:49:20 -0400 |
| commit | eec009945ce6f5a9a53fadae9f128703c5c90b82 (patch) | |
| tree | e1b99268d7e76557c5ae814f1cca0748fcf21283 /src | |
| parent | ae6e7a24b4afb1a76a461965d999d659116ea889 (diff) | |
| parent | 566324432cccf156fb0f4ddcb9993028bac5489c (diff) | |
| download | pfsense-eec009945ce6f5a9a53fadae9f128703c5c90b82.zip pfsense-eec009945ce6f5a9a53fadae9f128703c5c90b82.tar.gz | |
Merge pull request #3608 from jxmx/7206_route53
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/dyndns.class | 5 | ||||
| -rw-r--r-- | src/usr/local/www/services_dyndns_edit.php | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index 7772bc7..1ace9e5 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($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)); diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 083fce9..b30aa3d 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -372,7 +372,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.', '<br />'); $section->addInput(new Form_Input( |
