Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cloudflare: Remove unnecessary attributes from group_hosts_by args

Browse source
This commit is contained in:
Richard Hansen 2024-07-12 19:05:36 -04:00
parent 8e20185323
commit 45677c0403
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ddclient.in
View file

@ -6110,7 +6110,7 @@ EoEXAMPLE
###################################################################### ######################################################################
sub nic_cloudflare_update { sub nic_cloudflare_update {
debug("\nnic_cloudflare_update -------------------"); debug("\nnic_cloudflare_update -------------------");
my %groups = group_hosts_by(\@_, [qw(ssh login password server wildcard mx backupmx zone wantipv4 wantipv6)]); my %groups = group_hosts_by(\@_, [qw(login password)]);
for my $sig (keys %groups) { for my $sig (keys %groups) {
my @hosts = @{$groups{$sig}}; my @hosts = @{$groups{$sig}};
my $hosts = join(',', @hosts); my $hosts = join(',', @hosts);
@ -6130,15 +6130,15 @@ sub nic_cloudflare_update {
info("getting Cloudflare Zone ID for %s", $domain); info("getting Cloudflare Zone ID for %s", $domain);
# Get zone ID # Get zone ID
my $url = "https://$config{$key}{'server'}/zones/?"; my $url = "https://$config{$domain}{'server'}/zones/?";
$url .= "name=" . $config{$key}{'zone'}; $url .= "name=" . $config{$domain}{'zone'};
my $reply = geturl(proxy => opt('proxy'), my $reply = geturl(proxy => opt('proxy'),
url => $url, url => $url,
headers => $headers headers => $headers
); );
unless ($reply && header_ok($domain, $reply)) { unless ($reply && header_ok($domain, $reply)) {
failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'}); failed("updating %s: Could not connect to %s.", $domain, $config{$domain}{'server'});
next; next;
} }
@ -6151,9 +6151,9 @@ sub nic_cloudflare_update {
} }
# Pull the ID out of the json, messy # Pull the ID out of the json, messy
my ($zone_id) = map {$_->{name} eq $config{$key}{'zone'} ? $_->{id} : ()} @{$response->{result}}; my ($zone_id) = map {$_->{name} eq $config{$domain}{'zone'} ? $_->{id} : ()} @{$response->{result}};
unless ($zone_id) { unless ($zone_id) {
failed("updating %s: No zone ID found.", $config{$key}{'zone'}); failed("updating %s: No zone ID found.", $config{$domain}{'zone'});
next; next;
} }
info("Zone ID is %s", $zone_id); info("Zone ID is %s", $zone_id);
@ -6169,14 +6169,14 @@ sub nic_cloudflare_update {
$config{$domain}{"status-ipv$ipv"} = 'failed'; $config{$domain}{"status-ipv$ipv"} = 'failed';
# Get DNS 'A' or 'AAAA' record ID # Get DNS 'A' or 'AAAA' record ID
$url = "https://$config{$key}{'server'}/zones/$zone_id/dns_records?"; $url = "https://$config{$domain}{'server'}/zones/$zone_id/dns_records?";
$url .= "type=$type&name=$domain"; $url .= "type=$type&name=$domain";
$reply = geturl(proxy => opt('proxy'), $reply = geturl(proxy => opt('proxy'),
url => $url, url => $url,
headers => $headers headers => $headers
); );
unless ($reply && header_ok($domain, $reply)) { unless ($reply && header_ok($domain, $reply)) {
failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'}); failed("updating %s: Could not connect to %s.", $domain, $config{$domain}{'server'});
next; next;
} }
# Strip header # Strip header
@ -6194,7 +6194,7 @@ sub nic_cloudflare_update {
} }
debug("updating %s: DNS '$type' record ID: $dns_rec_id", $domain); debug("updating %s: DNS '$type' record ID: $dns_rec_id", $domain);
# Set domain # Set domain
$url = "https://$config{$key}{'server'}/zones/$zone_id/dns_records/$dns_rec_id"; $url = "https://$config{$domain}{'server'}/zones/$zone_id/dns_records/$dns_rec_id";
my $data = "{\"content\":\"$ip\"}"; my $data = "{\"content\":\"$ip\"}";
$reply = geturl(proxy => opt('proxy'), $reply = geturl(proxy => opt('proxy'),
url => $url, url => $url,