From patchwork Tue Apr 5 05:29:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,9/9] fff-nodewatcher: remove busybox httpd From: Tim Niemeyer X-Patchwork-Id: 57 Message-Id: <1459834164-6815-10-git-send-email-tim@tn-x.org> To: franken-dev@freifunk.net Cc: Tim Niemeyer Date: Tue, 5 Apr 2016 07:29:24 +0200 - remove httpd from .config - remove httpd startup from rc.local - add crawldata path creation in nodewatcher Signed-off-by: Tim Niemeyer --- Changes in v2: None bsp/ar71xx/.config | 1 - bsp/default/root_file_system/etc/rc.local.tpl | 4 ---- bsp/wdr4300/.config | 1 - bsp/wdr4900/.config | 1 - src/packages/fff/fff-nodewatcher/Makefile | 4 ++-- src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 4 +++- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config index 1a9f81a..22452a7 100644 --- a/bsp/ar71xx/.config +++ b/bsp/ar71xx/.config @@ -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_CLEAN_IPKG=y # CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set # CONFIG_FASTD_ENABLE_MAC_GHASH is not set diff --git a/bsp/default/root_file_system/etc/rc.local.tpl b/bsp/default/root_file_system/etc/rc.local.tpl index d6384d8..5d4a6c7 100755 --- a/bsp/default/root_file_system/etc/rc.local.tpl +++ b/bsp/default/root_file_system/etc/rc.local.tpl @@ -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 diff --git a/bsp/wdr4300/.config b/bsp/wdr4300/.config index 36dd5d9..04c9331 100644 --- a/bsp/wdr4300/.config +++ b/bsp/wdr4300/.config @@ -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_CLEAN_IPKG=y # CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set # CONFIG_FASTD_ENABLE_MAC_GHASH is not set diff --git a/bsp/wdr4900/.config b/bsp/wdr4900/.config index 70c27bf..bc9a890 100644 --- a/bsp/wdr4900/.config +++ b/bsp/wdr4900/.config @@ -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_CLEAN_IPKG=y # CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set # CONFIG_FASTD_ENABLE_MAC_GHASH is not set diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile index 2d5eddb..7be6e3b 100644 --- a/src/packages/fff/fff-nodewatcher/Makefile +++ b/src/packages/fff/fff-nodewatcher/Makefile @@ -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 diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index b76cb18..e9b734b 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -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="$SYSTEM_DATA$interface_data$BATMAN_ADV_INTERFACES$batman_adv_originators$batman_adv_gateway_mode$batman_adv_gateway_list$client_count" #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 }