summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-09-22 15:27:31 +0000
committerErmal <eri@pfsense.org>2010-09-22 15:27:31 +0000
commitfbd5fc52a755d46ef8de775fb6474af39fd14960 (patch)
tree44144941943666de068ba8e256e7eaab225eda3e /etc
parentcd9f13e02d6fc4b5102deb94adbd9148ea5ce286 (diff)
downloadpfsense-fbd5fc52a755d46ef8de775fb6474af39fd14960.zip
pfsense-fbd5fc52a755d46ef8de775fb6474af39fd14960.tar.gz
Bring gitsync to the new check_reload_status behaviour.
Diffstat (limited to 'etc')
-rw-r--r--etc/phpshellsessions/gitsync6
-rwxr-xr-xetc/rc.bootup2
2 files changed, 2 insertions, 6 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync
index 5efa4d7..6f7a53f 100644
--- a/etc/phpshellsessions/gitsync
+++ b/etc/phpshellsessions/gitsync
@@ -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";
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 3e5647b..dfa077f 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -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();
OpenPOWER on IntegriCloud