From c41c8119e3ea3cd38e3dfa09c389fd29cedba693 Mon Sep 17 00:00:00 2001 From: Ilia Date: Thu, 9 Jun 2022 15:00:31 +0300 Subject: [PATCH] Fix to use reload over restart when possible --- acl/backup_config.pl | 2 +- acl/convert.cgi | 2 +- acl/save_unix.cgi | 2 +- cluster-usermin/sync.cgi | 2 +- cluster-webmin/create_group.cgi | 2 +- cluster-webmin/create_user.cgi | 2 +- cluster-webmin/delete_group.cgi | 2 +- cluster-webmin/delete_user.cgi | 2 +- cluster-webmin/save_group.cgi | 2 +- cluster-webmin/save_user.cgi | 2 +- itsecur-firewall/restore.cgi | 2 +- itsecur-firewall/save_user.cgi | 2 +- time/save_timezone.cgi | 2 +- webmin/backup_config.pl | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/acl/backup_config.pl b/acl/backup_config.pl index b31a2dfc7..208c0bc60 100755 --- a/acl/backup_config.pl +++ b/acl/backup_config.pl @@ -98,7 +98,7 @@ foreach my $k (keys %aclbackup) { } &put_miniserv_config(\%miniserv); -&restart_miniserv(); +&reload_miniserv(); return undef; } diff --git a/acl/convert.cgi b/acl/convert.cgi index 289b60b28..6d41680b4 100755 --- a/acl/convert.cgi +++ b/acl/convert.cgi @@ -139,7 +139,7 @@ print &ui_columns_end(); # Finish off &modify_group($group->{'name'}, $group); -&restart_miniserv(); +&reload_miniserv(); # Print summary print &text('convert_done', $converted, $invalid, $exists, $skipped),"

\n"; diff --git a/acl/save_unix.cgi b/acl/save_unix.cgi index 11d5e3b50..47883f3f0 100755 --- a/acl/save_unix.cgi +++ b/acl/save_unix.cgi @@ -76,7 +76,7 @@ $miniserv{'pamany'} = $in{'pamany'} ? $in{'pamany_user'} : undef; &put_miniserv_config(\%miniserv); &unlock_file($ENV{'MINISERV_CONFIG'}); if ($oldsudo != $in{'sudo'}) { - &restart_miniserv(); + &reload_miniserv(); } else { &reload_miniserv(); diff --git a/cluster-usermin/sync.cgi b/cluster-usermin/sync.cgi index fcdf0e866..4368d73a1 100755 --- a/cluster-usermin/sync.cgi +++ b/cluster-usermin/sync.cgi @@ -119,7 +119,7 @@ foreach $host (@phosts) { print "$text{'sync_restart'}
\n"; if (!$in{'test'}) { &remote_foreign_call($serv->{'host'}, "acl", - "restart_miniserv"); + "reload_miniserv"); } print "$text{'refresh_done'}

\n"; diff --git a/cluster-webmin/create_group.cgi b/cluster-webmin/create_group.cgi index 8a183fd0c..3a97053f9 100755 --- a/cluster-webmin/create_group.cgi +++ b/cluster-webmin/create_group.cgi @@ -89,7 +89,7 @@ foreach $h (@hosts) { # Restart the remote webmin print $wh &serialise_variable([ 1 ]); - &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv"); + &remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); exit; } close($wh); diff --git a/cluster-webmin/create_user.cgi b/cluster-webmin/create_user.cgi index 61a6cba98..41ac28aca 100755 --- a/cluster-webmin/create_user.cgi +++ b/cluster-webmin/create_user.cgi @@ -123,7 +123,7 @@ foreach $h (@hosts) { # Restart the remote webmin print $wh &serialise_variable([ 1 ]); - &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv"); + &remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); exit; } close($wh); diff --git a/cluster-webmin/delete_group.cgi b/cluster-webmin/delete_group.cgi index 518a3d6da..c16e6ab92 100755 --- a/cluster-webmin/delete_group.cgi +++ b/cluster-webmin/delete_group.cgi @@ -95,7 +95,7 @@ foreach $h (@hosts) { # Restart the remote webmin print $wh &serialise_variable([ 1 ]); - &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv"); + &remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); exit; } close($wh); diff --git a/cluster-webmin/delete_user.cgi b/cluster-webmin/delete_user.cgi index 673601b39..7fcabbc33 100755 --- a/cluster-webmin/delete_user.cgi +++ b/cluster-webmin/delete_user.cgi @@ -59,7 +59,7 @@ foreach $h (@hosts) { # Restart the remote webmin print $wh &serialise_variable([ 1 ]); - &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv"); + &remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); exit; } close($wh); diff --git a/cluster-webmin/save_group.cgi b/cluster-webmin/save_group.cgi index 6614e3693..a7c3b88c2 100755 --- a/cluster-webmin/save_group.cgi +++ b/cluster-webmin/save_group.cgi @@ -143,7 +143,7 @@ foreach $h (@hosts) { # Restart the remote webmin print $wh &serialise_variable([ 1 ]); - &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv"); + &remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); exit; } close($wh); diff --git a/cluster-webmin/save_user.cgi b/cluster-webmin/save_user.cgi index 3af853c4b..5190f887a 100755 --- a/cluster-webmin/save_user.cgi +++ b/cluster-webmin/save_user.cgi @@ -179,7 +179,7 @@ foreach $h (@hosts) { # Restart the remote webmin print $wh &serialise_variable([ 1 ]); - &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv"); + &remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); exit; } close($wh); diff --git a/itsecur-firewall/restore.cgi b/itsecur-firewall/restore.cgi index d47c57c58..9e2bb072c 100755 --- a/itsecur-firewall/restore.cgi +++ b/itsecur-firewall/restore.cgi @@ -135,7 +135,7 @@ foreach $w (@what) { } &unlock_file("$config_directory/miniserv.users"); &unlock_file("$config_directory/webmin.acl"); - &restart_miniserv(); + &reload_miniserv(); } elsif ($w eq "searches") { # Copy searches directory diff --git a/itsecur-firewall/save_user.cgi b/itsecur-firewall/save_user.cgi index efc52be3d..728624655 100755 --- a/itsecur-firewall/save_user.cgi +++ b/itsecur-firewall/save_user.cgi @@ -108,7 +108,7 @@ else { } &save_module_acl(\%uaccess, $in{'name'}); } -&acl::restart_miniserv(); +&acl::reload_miniserv(); &unlock_itsecur_files(); &remote_webmin_log($in{'delete'} ? "delete" : $in{'new'} ? "create" : "update", "user", $user->{'name'}, $user); diff --git a/time/save_timezone.cgi b/time/save_timezone.cgi index 8bfcf2a59..dd972f3af 100755 --- a/time/save_timezone.cgi +++ b/time/save_timezone.cgi @@ -8,7 +8,7 @@ $access{'timezone'} || &error($text{'timezone_ecannot'}); &error_setup($text{'timezone_err'}); $in{'zone'} || &error($text{'timezone_enone'}); &set_current_timezone($in{'zone'}); -&restart_miniserv(); +&reload_miniserv(); &webmin_log("timezone", undef, $in{'zone'}); &redirect("index.cgi?mode=zone"); diff --git a/webmin/backup_config.pl b/webmin/backup_config.pl index b81f24817..f2125100f 100755 --- a/webmin/backup_config.pl +++ b/webmin/backup_config.pl @@ -77,7 +77,7 @@ foreach my $k (keys %oldconfig) { &write_file("$config_directory/config", \%gconfig); unlink("$config_directory/module.infos.cache"); -&restart_miniserv(); +&reload_miniserv(); return undef; }