Commit b542ddf7 authored by Franco Fichtner's avatar Franco Fichtner

rc: switch web GUI reload for reload all, some cleanups

parent 81e205f7
...@@ -30,7 +30,7 @@ echo " 0) Logout 7) Ping host" ...@@ -30,7 +30,7 @@ echo " 0) Logout 7) Ping host"
echo " 1) Assign Interfaces 8) Shell" echo " 1) Assign Interfaces 8) Shell"
echo " 2) Set interface(s) IP address 9) pfTop" echo " 2) Set interface(s) IP address 9) pfTop"
echo " 3) Reset the root password 10) Filter Logs" echo " 3) Reset the root password 10) Filter Logs"
echo " 4) Reset to factory defaults 11) Restart web interface" echo " 4) Reset to factory defaults 11) Reload all services"
echo " 5) Power off system 12) Upgrade from console" echo " 5) Power off system 12) Upgrade from console"
echo " 6) Reboot system 13) Restore a configuration" echo " 6) Reboot system 13) Restore a configuration"
echo echo
...@@ -76,7 +76,7 @@ case ${OPCODE} in ...@@ -76,7 +76,7 @@ case ${OPCODE} in
/usr/sbin/tcpdump -s 256 -v -S -l -n -e -ttt -i pflog0 /usr/sbin/tcpdump -s 256 -v -S -l -n -e -ttt -i pflog0
;; ;;
11) 11)
/usr/local/etc/rc.restart_webgui /usr/local/etc/rc.reload_all
;; ;;
12) 12)
/usr/local/etc/rc.initial.firmware /usr/local/etc/rc.initial.firmware
......
...@@ -66,3 +66,8 @@ if (function_exists('plugins_configure')) { ...@@ -66,3 +66,8 @@ if (function_exists('plugins_configure')) {
log_error("rc.reload_all: Reloading filter configuration."); log_error("rc.reload_all: Reloading filter configuration.");
filter_configure_sync(true); filter_configure_sync(true);
log_error("rc.reload_all: Reloading web GUI.");
system_webgui_configure(true);
enable_rrd_graphing(true);
...@@ -12,9 +12,5 @@ if (count($argv) > 1 && is_numeric($argv[1])) { ...@@ -12,9 +12,5 @@ if (count($argv) > 1 && is_numeric($argv[1])) {
sleep($argv[1]); sleep($argv[1]);
} }
echo 'Restarting webConfigurator...'; system_webgui_configure(true);
enable_rrd_graphing(true);
system_webgui_configure();
enable_rrd_graphing();
echo 'done.' . PHP_EOL;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment