github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Just lock the zone file instead of the whole domain, to prevent deadlocks when called from Virtualmin

Browse Source
This commit is contained in:
Jamie Cameron
2024-09-08 15:39:06 -07:00
parent 1f6697e05f
commit 11b4a8ca54
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webmin/letsencrypt-cleanup.pl
+5 -6
View File
@@ -26,17 +26,17 @@ my $wapi;
if ($zone) {
# Use BIND module API calls
$zone->{'file'} || die "Zone $dname does not have a records file";
&lock_file(&bind8::make_chroot(&bind8::absolute_path($zone->{'file'})));
$file = &bind8::absolute_path($zone->{'file'});
&lock_file(&bind8::make_chroot($file));
&bind8::before_editing($zone);
$recs = [ &bind8::read_zone_file($zone->{'file'}, $zname) ];
$file = $zone->{'file'};
$recs = [ &bind8::read_zone_file($file, $zname) ];
$wapi = 0;
}
elsif ($d) {
# Use Virtualmin API calls
&virtual_server::obtain_lock_dns($d);
&virtual_server::pre_records_change($d);
($recs, $file) = &virtual_server::get_domain_dns_records_and_file($d);
&lock_file(&bind8::make_chroot($file));
$wapi = 1;
}
else {
@@ -60,14 +60,13 @@ if (!$wapi) {
&bind8::sign_dnssec_zone_if_key($zone, $recs);
&bind8::bump_soa_record($file, $recs);
&bind8::after_editing($zone);
&unlock_file(&bind8::make_chroot(&bind8::absolute_path($file)));
&bind8::restart_zone($zone->{'name'}, $zone->{'view'});
}
else {
# Apply using Virtualmin API
&virtual_server::post_records_change($d, $recs, $file);
&virtual_server::release_lock_dns($d);
&virtual_server::reload_bind_records($d);
}
&unlock_file(&bind8::make_chroot($file));
&webmin_log("letsencryptcleanup", undef, $dname);
webmin/letsencrypt-dns.pl
+5 -6
View File
@@ -28,17 +28,17 @@ my $wapi;
if ($zone) {
# Use BIND module API calls
$zone->{'file'} || die "Zone $dname does not have a records file";
&lock_file(&bind8::make_chroot(&bind8::absolute_path($zone->{'file'})));
$file = &bind8::absolute_path($zone->{'file'});
&lock_file(&bind8::make_chroot($file));
&bind8::before_editing($zone);
$recs = [ &bind8::read_zone_file($zone->{'file'}, $zname) ];
$file = $zone->{'file'};
$recs = [ &bind8::read_zone_file($file, $zname) ];
$wapi = 0;
}
elsif ($d) {
# Use Virtualmin API calls
&virtual_server::obtain_lock_dns($d);
&virtual_server::pre_records_change($d);
($recs, $file) = &virtual_server::get_domain_dns_records_and_file($d);
&lock_file(&bind8::make_chroot($file));
$wapi = 1;
}
else {
@@ -79,15 +79,14 @@ if (!$wapi) {
&bind8::bump_soa_record($file, $recs);
&bind8::sign_dnssec_zone_if_key($zone, $recs);
&bind8::after_editing($zone);
&unlock_file(&bind8::make_chroot(&bind8::absolute_path($file)));
&bind8::restart_zone($zone->{'name'}, $zone->{'view'});
}
else {
# Apply using Virtualmin API
$err = &virtual_server::post_records_change($d, $recs, $file);
&virtual_server::release_lock_dns($d);
&virtual_server::reload_bind_records($d);
}
&unlock_file(&bind8::make_chroot($file));
die $err if ($err);
sleep($config{'letsencrypt_dns_wait'} || 10); # Wait for DNS propagation
&webmin_log("letsencryptdns", undef, $dname);