hetzner: Remove unnecessary host groupings
Each host is already updated individually so there's no point in grouping the hosts.
This commit is contained in:
parent
5ae0fd3024
commit
216c9c6010
1 changed files with 85 additions and 92 deletions
29
ddclient.in
29
ddclient.in
|
@ -6253,31 +6253,25 @@ EoEXAMPLE
|
||||||
######################################################################
|
######################################################################
|
||||||
sub nic_hetzner_update {
|
sub nic_hetzner_update {
|
||||||
debug("\nnic_hetzner_update -------------------");
|
debug("\nnic_hetzner_update -------------------");
|
||||||
my %groups = group_hosts_by(\@_, [qw(ssh login password server wildcard mx backupmx zone wantipv4 wantipv6)]);
|
for my $domain (@_) {
|
||||||
for my $sig (keys %groups) {
|
my $headers = "Auth-API-Token: $config{$domain}{'password'}\n";
|
||||||
my @hosts = @{$groups{$sig}};
|
|
||||||
my $hosts = join(',', @hosts);
|
|
||||||
my $key = $hosts[0];
|
|
||||||
|
|
||||||
my $headers = "Auth-API-Token: $config{$key}{'password'}\n";
|
|
||||||
$headers .= "Content-Type: application/json";
|
$headers .= "Content-Type: application/json";
|
||||||
|
|
||||||
for my $domain (@hosts) {
|
(my $hostname = $domain) =~ s/\.$config{$domain}{zone}$//;
|
||||||
(my $hostname = $domain) =~ s/\.$config{$key}{zone}$//;
|
|
||||||
my $ipv4 = delete $config{$domain}{'wantipv4'};
|
my $ipv4 = delete $config{$domain}{'wantipv4'};
|
||||||
my $ipv6 = delete $config{$domain}{'wantipv6'};
|
my $ipv6 = delete $config{$domain}{'wantipv6'};
|
||||||
|
|
||||||
info("getting Hetzner Zone ID for %s", $domain);
|
info("getting Hetzner Zone ID for %s", $domain);
|
||||||
|
|
||||||
# Get zone ID
|
# Get zone ID
|
||||||
my $url = "https://$config{$key}{'server'}/zones?name=" . $config{$key}{'zone'};
|
my $url = "https://$config{$domain}{'server'}/zones?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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6290,9 +6284,9 @@ sub nic_hetzner_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->{zones}};
|
my ($zone_id) = map {$_->{name} eq $config{$domain}{'zone'} ? $_->{id} : ()} @{$response->{zones}};
|
||||||
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);
|
||||||
|
@ -6307,13 +6301,13 @@ sub nic_hetzner_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'}/records?zone_id=$zone_id";
|
$url = "https://$config{$domain}{'server'}/records?zone_id=$zone_id";
|
||||||
$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
|
||||||
|
@ -6331,11 +6325,11 @@ sub nic_hetzner_update {
|
||||||
if ($dns_rec_id)
|
if ($dns_rec_id)
|
||||||
{
|
{
|
||||||
debug("updating %s: DNS '$type' record ID: $dns_rec_id", $domain);
|
debug("updating %s: DNS '$type' record ID: $dns_rec_id", $domain);
|
||||||
$url = "https://$config{$key}{'server'}/records/$dns_rec_id";
|
$url = "https://$config{$domain}{'server'}/records/$dns_rec_id";
|
||||||
$http_method = "PUT";
|
$http_method = "PUT";
|
||||||
} else {
|
} else {
|
||||||
debug("creating %s: DNS '$type'", $domain);
|
debug("creating %s: DNS '$type'", $domain);
|
||||||
$url = "https://$config{$key}{'server'}/records";
|
$url = "https://$config{$domain}{'server'}/records";
|
||||||
$http_method = "POST";
|
$http_method = "POST";
|
||||||
}
|
}
|
||||||
my $data = "{\"zone_id\":\"$zone_id\", \"name\": \"$hostname\", \"value\": \"$ip\", \"type\": \"$type\", \"ttl\": $config{$domain}{'ttl'}}";
|
my $data = "{\"zone_id\":\"$zone_id\", \"name\": \"$hostname\", \"value\": \"$ip\", \"type\": \"$type\", \"ttl\": $config{$domain}{'ttl'}}";
|
||||||
|
@ -6364,7 +6358,6 @@ sub nic_hetzner_update {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
## nic_yandex_examples
|
## nic_yandex_examples
|
||||||
|
|
Loading…
Reference in a new issue