michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix to use reload over restart when possible"

Browse Source 
This reverts commit c41c8119e3.
This commit is contained in:
iliajie
2022-06-25 15:50:16 +03:00
parent 404310f230
commit 88aadc1c4a
14 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acl/backup_config.pl
View File

@@ -98,7 +98,7 @@ foreach my $k (keys %aclbackup) {
} }
&put_miniserv_config(\%miniserv); &put_miniserv_config(\%miniserv);
&reload_miniserv(); &restart_miniserv();
return undef; return undef;
} }

2
acl/convert.cgi
View File

@@ -139,7 +139,7 @@ print &ui_columns_end();
# Finish off # Finish off
&modify_group($group->{'name'}, $group); &modify_group($group->{'name'}, $group);
&reload_miniserv(); &restart_miniserv();
# Print summary # Print summary
print &text('convert_done', $converted, $invalid, $exists, $skipped),"<p>\n"; print &text('convert_done', $converted, $invalid, $exists, $skipped),"<p>\n";

2
acl/save_unix.cgi
View File

@@ -76,7 +76,7 @@ $miniserv{'pamany'} = $in{'pamany'} ? $in{'pamany_user'} : undef;
&put_miniserv_config(\%miniserv); &put_miniserv_config(\%miniserv);
&unlock_file($ENV{'MINISERV_CONFIG'}); &unlock_file($ENV{'MINISERV_CONFIG'});
if ($oldsudo != $in{'sudo'}) { if ($oldsudo != $in{'sudo'}) {
&reload_miniserv(); &restart_miniserv();
} }
else { else {
&reload_miniserv(); &reload_miniserv();

2
cluster-usermin/sync.cgi
View File

@@ -119,7 +119,7 @@ foreach $host (@phosts) {
print "$text{'sync_restart'}<br>\n"; print "$text{'sync_restart'}<br>\n";
if (!$in{'test'}) { if (!$in{'test'}) {
&remote_foreign_call($serv->{'host'}, "acl", &remote_foreign_call($serv->{'host'}, "acl",
"reload_miniserv"); "restart_miniserv");
} }
print "$text{'refresh_done'}<p>\n"; print "$text{'refresh_done'}<p>\n";

2
cluster-webmin/create_group.cgi
View File

@@ -89,7 +89,7 @@ foreach $h (@hosts) {
# Restart the remote webmin # Restart the remote webmin
print $wh &serialise_variable([ 1 ]); print $wh &serialise_variable([ 1 ]);
&remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv");
exit; exit;
} }
close($wh); close($wh);

2
cluster-webmin/create_user.cgi
View File

@@ -123,7 +123,7 @@ foreach $h (@hosts) {
# Restart the remote webmin # Restart the remote webmin
print $wh &serialise_variable([ 1 ]); print $wh &serialise_variable([ 1 ]);
&remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv");
exit; exit;
} }
close($wh); close($wh);

2
cluster-webmin/delete_group.cgi
View File

@@ -95,7 +95,7 @@ foreach $h (@hosts) {
# Restart the remote webmin # Restart the remote webmin
print $wh &serialise_variable([ 1 ]); print $wh &serialise_variable([ 1 ]);
&remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv");
exit; exit;
} }
close($wh); close($wh);

2
cluster-webmin/delete_user.cgi
View File

@@ -59,7 +59,7 @@ foreach $h (@hosts) {
# Restart the remote webmin # Restart the remote webmin
print $wh &serialise_variable([ 1 ]); print $wh &serialise_variable([ 1 ]);
&remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv");
exit; exit;
} }
close($wh); close($wh);

2
cluster-webmin/save_group.cgi
View File

@@ -143,7 +143,7 @@ foreach $h (@hosts) {
# Restart the remote webmin # Restart the remote webmin
print $wh &serialise_variable([ 1 ]); print $wh &serialise_variable([ 1 ]);
&remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv");
exit; exit;
} }
close($wh); close($wh);

2
cluster-webmin/save_user.cgi
View File

@@ -179,7 +179,7 @@ foreach $h (@hosts) {
# Restart the remote webmin # Restart the remote webmin
print $wh &serialise_variable([ 1 ]); print $wh &serialise_variable([ 1 ]);
&remote_foreign_call($s->{'host'}, "acl", "reload_miniserv"); &remote_foreign_call($s->{'host'}, "acl", "restart_miniserv");
exit; exit;
} }
close($wh); close($wh);

2
itsecur-firewall/restore.cgi
View File

@@ -135,7 +135,7 @@ foreach $w (@what) {
} }
&unlock_file("$config_directory/miniserv.users"); &unlock_file("$config_directory/miniserv.users");
&unlock_file("$config_directory/webmin.acl"); &unlock_file("$config_directory/webmin.acl");
&reload_miniserv(); &restart_miniserv();
} }
elsif ($w eq "searches") { elsif ($w eq "searches") {
# Copy searches directory # Copy searches directory

2
itsecur-firewall/save_user.cgi
View File

@@ -108,7 +108,7 @@ else {
} }
&save_module_acl(\%uaccess, $in{'name'}); &save_module_acl(\%uaccess, $in{'name'});
} }
&acl::reload_miniserv(); &acl::restart_miniserv();
&unlock_itsecur_files(); &unlock_itsecur_files();
&remote_webmin_log($in{'delete'} ? "delete" : $in{'new'} ? "create" : "update", &remote_webmin_log($in{'delete'} ? "delete" : $in{'new'} ? "create" : "update",
"user", $user->{'name'}, $user); "user", $user->{'name'}, $user);

2
time/save_timezone.cgi
View File

@@ -8,7 +8,7 @@ $access{'timezone'} || &error($text{'timezone_ecannot'});
&error_setup($text{'timezone_err'}); &error_setup($text{'timezone_err'});
$in{'zone'} || &error($text{'timezone_enone'}); $in{'zone'} || &error($text{'timezone_enone'});
&set_current_timezone($in{'zone'}); &set_current_timezone($in{'zone'});
&reload_miniserv(); &restart_miniserv();
&webmin_log("timezone", undef, $in{'zone'}); &webmin_log("timezone", undef, $in{'zone'});
&redirect("index.cgi?mode=zone"); &redirect("index.cgi?mode=zone");

2
webmin/backup_config.pl
View File

@@ -77,7 +77,7 @@ foreach my $k (keys %oldconfig) {
&write_file("$config_directory/config", \%gconfig); &write_file("$config_directory/config", \%gconfig);
unlink("$config_directory/module.infos.cache"); unlink("$config_directory/module.infos.cache");
&reload_miniserv(); &restart_miniserv();
return undef; return undef;
} }