mirror of
https://github.com/webmin/webmin.git
synced 2026-03-20 08:40:24 +00:00
Lower reload time but make sure it's not auto-restarted on force reload
This commit is contained in:
2
setup.pl
2
setup.pl
@@ -642,8 +642,8 @@ else {
|
||||
|
||||
# Force reload systemd
|
||||
open(FRELOADD, ">$config_directory/restart-by-force-kill");
|
||||
print FRELOADD "$config_directory/.stop-init --kill >/dev/null 2>&1\n";
|
||||
print FRELOADD "$systemctlcmd stop webmin\n";
|
||||
print FRELOADD "$config_directory/.stop-init --kill >/dev/null 2>&1\n";
|
||||
print FRELOADD "$systemctlcmd start webmin\n";
|
||||
close(FRELOADD);
|
||||
|
||||
|
||||
2
setup.sh
2
setup.sh
@@ -694,8 +694,8 @@ if [ -x "$systemctlcmd" ]; then
|
||||
echo "$systemctlcmd restart webmin" >>$config_dir/restart
|
||||
# Force reload systemd
|
||||
echo "#!/bin/sh" >>$config_dir/restart-by-force-kill
|
||||
echo "$config_dir/.stop-init --kill >/dev/null 2>&1" >>$config_dir/restart-by-force-kill
|
||||
echo "$systemctlcmd stop webmin" >>$config_dir/restart-by-force-kill
|
||||
echo "$config_dir/.stop-init --kill >/dev/null 2>&1" >>$config_dir/restart-by-force-kill
|
||||
echo "$systemctlcmd start webmin" >>$config_dir/restart-by-force-kill
|
||||
# Reload systemd
|
||||
echo "#!/bin/sh" >>$config_dir/reload
|
||||
|
||||
@@ -8,7 +8,7 @@ ExecStop=/etc/webmin/.stop-init
|
||||
PIDFile=/var/webmin/miniserv.pid
|
||||
Type=forking
|
||||
Restart=on-failure
|
||||
RestartSec=3s
|
||||
RestartSec=1s
|
||||
StartLimitBurst=3
|
||||
StartLimitIntervalSec=3
|
||||
OOMPolicy=continue
|
||||
|
||||
Reference in New Issue
Block a user