mark
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fff-nodewatcher: remove busybox httpd 

- remove httpd from .config
- remove httpd startup from rc.local
- add crawldata path creation in nodewatcher

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>
Tested-by: Christian Dresel <fff@chrisi01.de>
Reviewed-by: Christian Dresel <fff@chrisi01.de>
Reviewed-by: Jan Kraus <mayosemmel@gmail.com>
This commit is contained in:
Tim Niemeyer 2016-04-05 21:56:50 +02:00 committed by Tobias Klaus
parent ec380f7918
commit af80123aa2
6 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsp/ar71xx/.config
View File

@ -10,7 +10,6 @@ CONFIG_ATH_USER_REGD=y
# CONFIG_BUSYBOX_CONFIG_CROND is not set
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
CONFIG_BUSYBOX_CONFIG_HTTPD=y
CONFIG_BUSYBOX_CONFIG_SHA256SUM=y
CONFIG_CLEAN_IPKG=y
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set

4
bsp/default/root_file_system/etc/rc.local.tpl
View File

@ -59,10 +59,6 @@ fi
/etc/init.d/qos disable
/etc/init.d/qos stop
#busybox-httpd for crawldata
mkdir /tmp/crawldata
httpd -h /tmp/crawldata
touch /tmp/started
exit 0

1
bsp/wdr4300/.config
View File

@ -10,7 +10,6 @@ CONFIG_ATH_USER_REGD=y
# CONFIG_BUSYBOX_CONFIG_CROND is not set
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
CONFIG_BUSYBOX_CONFIG_HTTPD=y
CONFIG_BUSYBOX_CONFIG_SHA256SUM=y
CONFIG_CLEAN_IPKG=y
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set

1
bsp/wdr4900/.config
View File

@ -10,7 +10,6 @@ CONFIG_ATH_USER_REGD=y
# CONFIG_BUSYBOX_CONFIG_CROND is not set
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
CONFIG_BUSYBOX_CONFIG_HTTPD=y
CONFIG_BUSYBOX_CONFIG_SHA256SUM=y
CONFIG_CLEAN_IPKG=y
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set

4
src/packages/fff/fff-nodewatcher/Makefile
View File

@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-nodewatcher
PKG_VERSION:=36
PKG_RELEASE:=3
PKG_VERSION:=37
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher

4
src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
View File

@ -2,7 +2,7 @@
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
# License; GPL v3
SCRIPT_VERSION="36"
SCRIPT_VERSION="37"
test -f /tmp/started || exit
@ -238,6 +238,8 @@ crawl() {
DATA="<?xml version='1.0' standalone='yes'?><data><system_data>$SYSTEM_DATA</system_data><interface_data>$interface_data</interface_data><batman_adv_interfaces>$BATMAN_ADV_INTERFACES</batman_adv_interfaces><batman_adv_originators>$batman_adv_originators</batman_adv_originators><batman_adv_gateway_mode>$batman_adv_gateway_mode</batman_adv_gateway_mode><batman_adv_gateway_list>$batman_adv_gateway_list</batman_adv_gateway_list><client_count>$client_count</client_count></data>"
#write data to hxml file that provides the data on httpd
SCRIPT_DATA_DIR=$(dirname $SCRIPT_DATA_FILE)
test -d $SCRIPT_DATA_DIR || mkdir -p $SCRIPT_DATA_DIR
echo $DATA | gzip | tee $SCRIPT_DATA_FILE | alfred -s 64
}