Skip to content

W
White Rabbit Switch - Software
Commit a268d82d authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

[FEATURE: 1583] disable web interface via dot-config 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 74a34027
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 2 deletions
Kconfig
View file @ a268d82d
......@@ -920,6 +920,12 @@ config CUSTOM_BOOT_SCRIPT_SOURCE_REMOTE_URL
endmenu
config HTTPD_DISABLE
bool "Disable web interface"
default n
help
Disable web interface.
menu "Developer options"
config MONIT_DISABLE
bool "Disable monit"
......
doc/wrs-user-manual.in
View file @ a268d82d
......@@ -926,6 +926,9 @@ appropriate way, before the respective service is started.
up a batch of switches with different configurations (similar to the
@t{CONFIG_DOTCONF_URL}, please refer to @ref{The Configuration File}).
@item CONFIG_HTTPD_DISABLE
Disable web interface on a switch.
@item CONFIG_MONIT_DISABLE
Disable monitoring of running processes by @i{Monit}. @i{Monit} by
......
userspace/rootfs_override/etc/init.d/lighttpd.sh
View file @ a268d82d
......@@ -2,6 +2,9 @@
#
# Starts lighttpd daemon.
#
MONIT=/usr/bin/monit
dotconfig=/wr/etc/dot-config
start_counter() {
# increase boot counter
......@@ -17,6 +20,25 @@ start_counter() {
start() {
echo -n "Starting lighttpd daemon: "
if [ -f $dotconfig ]; then
. $dotconfig
else
echo "$0 unable to source dot-config ($dotconfig)!"
fi
if [ "$CONFIG_HTTPD_DISABLE" = "y" ]; then
echo "web interface disabled in dot-config!"
if [ "$1" != "force" ]; then
# Unmonitor web server (lighttpd), ignore all printouts
# from monit.
# Run in background since monit may wait for a timeout.
$MONIT unmonitor lighttpd &>/dev/null &
exit 0
fi
echo -n "Force start of lighttpd: "
fi
# note start-stop-daemon does not create pidfile, only check if pid is
# running
start-stop-daemon -q -p /var/run/lighttpd.pid -S \
......@@ -30,6 +52,15 @@ start() {
else
echo "Failed"
fi
# check whether the process was monitored
$MONIT summary 2>&1 | grep lighttpd | grep "Not monitored" &> /dev/null
if [ $? -eq 0 ]; then
echo "web interface was not monitored, enabling monitoring"
# the process was not monitored, enable monitoring
# this will generate extra log entries from monit
$MONIT monitor lighttpd
fi
}
stop() {
......@@ -60,7 +91,8 @@ case "$1" in
restart
;;
*)
echo $"Usage: $0 {start|stop|restart}"
echo "Usage: $0 {start <force>|stop|restart}"
echo " start force -- enable web interface even it is disabled in the dot-config"
exit 1
esac
......
userspace/snmpd/wrsBootStatusGroup.c
View file @ a268d82d
......@@ -93,6 +93,7 @@ struct wrs_usd_item {
uint32_t cnt; /* number of processes found */
};
#define UDI_HTTP 4 /* index of web server in userspace_daemons array */
#define UDI_MONIT 5 /* index of MONIT in userspace_daemons array */
/* user space daemon list */
/* - key contain process name reported by ps command
......@@ -107,7 +108,8 @@ static struct wrs_usd_item userspace_daemons[] = {
[1] = {"/wr/bin/wrsw_hal", 2}, /* two wrsw_hal instances */
[2] = {"/wr/bin/wrsw_rtud", 1},
[3] = {"/wr/bin/ppsi", 1},
[4] = {"/usr/sbin/lighttpd", 1},
[UDI_HTTP] = {"/usr/sbin/lighttpd", 1}, /* web interface can be
* disabled in dot-config */
[UDI_MONIT] = {"/usr/bin/monit", 1}, /* Monit can be disabled in
* dot-config */
[6] = {"/usr/sbin/snmpd", 1},
......@@ -475,6 +477,14 @@ static void update_daemon_expectancy(struct wrs_usd_item *daemon_array)
snmp_log(LOG_INFO, "SNMP: Info wrsBootUserspaceDaemonsMissing:"
" CONFIG_MONIT_DISABLE=y in dot-config\n");
}
tmp = libwr_cfg_get("HTTPD_DISABLE");
if (tmp && !strcmp(tmp, "y")) {
/* SNMP should not expect lighttpd (web server) to be running*/
daemon_array[UDI_HTTP].exp = 0;
snmp_log(LOG_INFO, "SNMP: Info wrsBootUserspaceDaemonsMissing:"
" CONFIG_HTTPD_DISABLE=y in dot-config\n");
}
}
/* check if daemons from userspace_daemons array are running */
......
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