Bring gitsync to the new check_reload_status behaviour.

This commit is contained in:
Ermal 2010-09-22 15:27:31 +00:00
parent cd9f13e02d
commit fbd5fc52a7
3 changed files with 3 additions and 7 deletions

View File

@ -284,10 +284,6 @@ function post_cvssync_commands() {
echo "===> Upgrading configuration (if needed)...\n";
convert_config();
echo "===> Restarting check_reload_status...\n";
exec("killall check_reload_status");
mwexec_bg("nohup /usr/bin/nice -n20 /usr/local/sbin/check_reload_status");
echo "===> Configuring filter...";
exec("/etc/rc.filter_configure_sync");
exec("pfctl -f /tmp/rules.debug");
@ -308,7 +304,7 @@ function post_cvssync_commands() {
fwrite($fd, "#!/bin/sh\n");
fwrite($fd, "sleep 5\n");
fwrite($fd, "killall php\n");
fwrite($fd, "touch /tmp/restart_webgui\n");
fwrite($fd, "/usr/local/sbin/pfSctl -c 'service restart webgui'\n");
fclose($fd);
mwexec_bg("sh /tmp/restart_lighty");
echo "\n";

View File

@ -263,7 +263,7 @@ echo "done.\n";
if($avail > 0 and $avail < 65) {
echo "System has less than 65 megabytes of ram {$avail}. Delaying webConfigurator startup.\n";
/* start webConfigurator up on final pass */
touch("/tmp/restart_webgui");
/usr/local/sbin/pfSctl -c 'service restart webgui'
} else {
/* start web server */
system_webgui_start();

View File

@ -468,7 +468,7 @@ if ($restart_webgui) {
ob_flush();
flush();
log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
touch("{$g['tmp_path']}/restart_webgui");
send_event("service restart webgui");
}
?>