modules/freifunk: Move profiles and common files into seperate packages, this will enable us to build freifunk images without luci.

44 files changed, 151 insertions, 7 deletions

diff --git a/contrib/package/community-profiles/Makefile b/contrib/package/community-profiles/Makefile
new file mode 100644
index 000000000..439b6837b
--- /dev/null
+++ b/contrib/package/community-profiles/Makefile
@@ -0,0 +1,39 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=community-profiles
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/community-profiles
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=Freifunk
+  TITLE:=Community profiles
+  DEPENDS:=freifunk-common
+endef
+
+define Package/community-profiles/description
+  These community profiles set defaults for various free network/freifunk communities and are used by wizards like ffwizard and meshwizard.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/community-profiles/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,community-profiles))
diff --git a/modules/freifunk/root/etc/config/profile_Freifunk b/contrib/package/community-profiles/files/etc/config/profile_Freifunk
index b8f445a73..b8f445a73 100644
--- a/modules/freifunk/root/etc/config/profile_Freifunk
+++ b/contrib/package/community-profiles/files/etc/config/profile_Freifunk
diff --git a/modules/freifunk/root/etc/config/profile_aachen b/contrib/package/community-profiles/files/etc/config/profile_aachen
index 8445516db..8445516db 100644
--- a/modules/freifunk/root/etc/config/profile_aachen
+++ b/contrib/package/community-profiles/files/etc/config/profile_aachen
diff --git a/modules/freifunk/root/etc/config/profile_augsburg b/contrib/package/community-profiles/files/etc/config/profile_augsburg
index d31558585..d31558585 100644
--- a/modules/freifunk/root/etc/config/profile_augsburg
+++ b/contrib/package/community-profiles/files/etc/config/profile_augsburg
diff --git a/modules/freifunk/root/etc/config/profile_bayreuth b/contrib/package/community-profiles/files/etc/config/profile_bayreuth
index 90fccbd81..90fccbd81 100644
--- a/modules/freifunk/root/etc/config/profile_bayreuth
+++ b/contrib/package/community-profiles/files/etc/config/profile_bayreuth
diff --git a/modules/freifunk/root/etc/config/profile_bensheim b/contrib/package/community-profiles/files/etc/config/profile_bensheim
index 48c1d47b7..48c1d47b7 100644
--- a/modules/freifunk/root/etc/config/profile_bensheim
+++ b/contrib/package/community-profiles/files/etc/config/profile_bensheim
diff --git a/modules/freifunk/root/etc/config/profile_bergischesland b/contrib/package/community-profiles/files/etc/config/profile_bergischesland
index 0de454303..0de454303 100644
--- a/modules/freifunk/root/etc/config/profile_bergischesland
+++ b/contrib/package/community-profiles/files/etc/config/profile_bergischesland
diff --git a/modules/freifunk/root/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin
index c41144e48..c41144e48 100644
--- a/modules/freifunk/root/etc/config/profile_berlin
+++ b/contrib/package/community-profiles/files/etc/config/profile_berlin
diff --git a/modules/freifunk/root/etc/config/profile_carbodebit b/contrib/package/community-profiles/files/etc/config/profile_carbodebit
index 0b263f9c0..0b263f9c0 100644
--- a/modules/freifunk/root/etc/config/profile_carbodebit
+++ b/contrib/package/community-profiles/files/etc/config/profile_carbodebit
diff --git a/modules/freifunk/root/etc/config/profile_dresden b/contrib/package/community-profiles/files/etc/config/profile_dresden
index 6b5dc879a..6b5dc879a 100644
--- a/modules/freifunk/root/etc/config/profile_dresden
+++ b/contrib/package/community-profiles/files/etc/config/profile_dresden
diff --git a/modules/freifunk/root/etc/config/profile_duesseldorf b/contrib/package/community-profiles/files/etc/config/profile_duesseldorf
index cb36aabf6..cb36aabf6 100644
--- a/modules/freifunk/root/etc/config/profile_duesseldorf
+++ b/contrib/package/community-profiles/files/etc/config/profile_duesseldorf
diff --git a/modules/freifunk/root/etc/config/profile_evernet b/contrib/package/community-profiles/files/etc/config/profile_evernet
index 05453608d..05453608d 100644
--- a/modules/freifunk/root/etc/config/profile_evernet
+++ b/contrib/package/community-profiles/files/etc/config/profile_evernet
diff --git a/modules/freifunk/root/etc/config/profile_gadow b/contrib/package/community-profiles/files/etc/config/profile_gadow
index 79466f181..79466f181 100644
--- a/modules/freifunk/root/etc/config/profile_gadow
+++ b/contrib/package/community-profiles/files/etc/config/profile_gadow
diff --git a/modules/freifunk/root/etc/config/profile_guifibages b/contrib/package/community-profiles/files/etc/config/profile_guifibages
index a0fc4fc1e..a0fc4fc1e 100644
--- a/modules/freifunk/root/etc/config/profile_guifibages
+++ b/contrib/package/community-profiles/files/etc/config/profile_guifibages
diff --git a/modules/freifunk/root/etc/config/profile_halle b/contrib/package/community-profiles/files/etc/config/profile_halle
index 2680087ba..2680087ba 100644
--- a/modules/freifunk/root/etc/config/profile_halle
+++ b/contrib/package/community-profiles/files/etc/config/profile_halle
diff --git a/modules/freifunk/root/etc/config/profile_hamburg b/contrib/package/community-profiles/files/etc/config/profile_hamburg
index ba1dd2170..ba1dd2170 100644
--- a/modules/freifunk/root/etc/config/profile_hamburg
+++ b/contrib/package/community-profiles/files/etc/config/profile_hamburg
diff --git a/modules/freifunk/root/etc/config/profile_hannover b/contrib/package/community-profiles/files/etc/config/profile_hannover
index 008b6c70e..008b6c70e 100644
--- a/modules/freifunk/root/etc/config/profile_hannover
+++ b/contrib/package/community-profiles/files/etc/config/profile_hannover
diff --git a/modules/freifunk/root/etc/config/profile_heppenheim b/contrib/package/community-profiles/files/etc/config/profile_heppenheim
index a8304946b..a8304946b 100644
--- a/modules/freifunk/root/etc/config/profile_heppenheim
+++ b/contrib/package/community-profiles/files/etc/config/profile_heppenheim
diff --git a/modules/freifunk/root/etc/config/profile_jena b/contrib/package/community-profiles/files/etc/config/profile_jena
index 5741d09b2..5741d09b2 100644
--- a/modules/freifunk/root/etc/config/profile_jena
+++ b/contrib/package/community-profiles/files/etc/config/profile_jena
diff --git a/modules/freifunk/root/etc/config/profile_kiberpipa b/contrib/package/community-profiles/files/etc/config/profile_kiberpipa
index c2a96e47c..c2a96e47c 100644
--- a/modules/freifunk/root/etc/config/profile_kiberpipa
+++ b/contrib/package/community-profiles/files/etc/config/profile_kiberpipa
diff --git a/modules/freifunk/root/etc/config/profile_l59 b/contrib/package/community-profiles/files/etc/config/profile_l59
index 6185f0257..6185f0257 100644
--- a/modules/freifunk/root/etc/config/profile_l59
+++ b/contrib/package/community-profiles/files/etc/config/profile_l59
diff --git a/modules/freifunk/root/etc/config/profile_leipzig b/contrib/package/community-profiles/files/etc/config/profile_leipzig
index 17f3cad41..17f3cad41 100644
--- a/modules/freifunk/root/etc/config/profile_leipzig
+++ b/contrib/package/community-profiles/files/etc/config/profile_leipzig
diff --git a/modules/freifunk/root/etc/config/profile_mainz b/contrib/package/community-profiles/files/etc/config/profile_mainz
index 2d086183e..2d086183e 100644
--- a/modules/freifunk/root/etc/config/profile_mainz
+++ b/contrib/package/community-profiles/files/etc/config/profile_mainz
diff --git a/modules/freifunk/root/etc/config/profile_marburg b/contrib/package/community-profiles/files/etc/config/profile_marburg
index 18cff80e5..18cff80e5 100644
--- a/modules/freifunk/root/etc/config/profile_marburg
+++ b/contrib/package/community-profiles/files/etc/config/profile_marburg
diff --git a/modules/freifunk/root/etc/config/profile_neuss b/contrib/package/community-profiles/files/etc/config/profile_neuss
index 8e3061730..8e3061730 100644
--- a/modules/freifunk/root/etc/config/profile_neuss
+++ b/contrib/package/community-profiles/files/etc/config/profile_neuss
diff --git a/modules/freifunk/root/etc/config/profile_oldenburg b/contrib/package/community-profiles/files/etc/config/profile_oldenburg
index e967fdb43..e967fdb43 100644
--- a/modules/freifunk/root/etc/config/profile_oldenburg
+++ b/contrib/package/community-profiles/files/etc/config/profile_oldenburg
diff --git a/modules/freifunk/root/etc/config/profile_openwireless_bern b/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern
index 810ad8f1c..810ad8f1c 100644
--- a/modules/freifunk/root/etc/config/profile_openwireless_bern
+++ b/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern
diff --git a/modules/freifunk/root/etc/config/profile_pberg b/contrib/package/community-profiles/files/etc/config/profile_pberg
index ea2f7b081..ea2f7b081 100644
--- a/modules/freifunk/root/etc/config/profile_pberg
+++ b/contrib/package/community-profiles/files/etc/config/profile_pberg
diff --git a/modules/freifunk/root/etc/config/profile_piraten_dresden b/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden
index 2af0e319d..2af0e319d 100644
--- a/modules/freifunk/root/etc/config/profile_piraten_dresden
+++ b/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden
diff --git a/modules/freifunk/root/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam
index a70a29ee5..a70a29ee5 100644
--- a/modules/freifunk/root/etc/config/profile_potsdam
+++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam
diff --git a/modules/freifunk/root/etc/config/profile_rosbach b/contrib/package/community-profiles/files/etc/config/profile_rosbach
index 4444f7099..4444f7099 100644
--- a/modules/freifunk/root/etc/config/profile_rosbach
+++ b/contrib/package/community-profiles/files/etc/config/profile_rosbach
diff --git a/modules/freifunk/root/etc/config/profile_seefeld b/contrib/package/community-profiles/files/etc/config/profile_seefeld
index 5d03f7d04..5d03f7d04 100644
--- a/modules/freifunk/root/etc/config/profile_seefeld
+++ b/contrib/package/community-profiles/files/etc/config/profile_seefeld
diff --git a/modules/freifunk/root/etc/config/profile_wlanljubljana b/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana
index eeefbd22b..eeefbd22b 100644
--- a/modules/freifunk/root/etc/config/profile_wlanljubljana
+++ b/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana
diff --git a/contrib/package/freifunk-common/Makefile b/contrib/package/freifunk-common/Makefile
new file mode 100644
index 000000000..9c05ed410
--- /dev/null
+++ b/contrib/package/freifunk-common/Makefile
@@ -0,0 +1,43 @@
+# Copyright (C) 2011 Manuel Munz <freifunk at somakoma de>
+# This is free software, licensed under the Apache 2.0 license.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=freifunk-common
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/freifunk-common
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=Freifunk
+  TITLE:=Freifunk common files
+  DEPENDS:=freifunk-common
+endef
+
+define Package/freifunk-common/description
+  Common files and scripts that are needed to run free wireless mesh networks.
+endef
+
+define Package/luci-mod-freifunk/conffiles
+/etc/config/freifunk
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/freifunk-common/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,freifunk-common))
diff --git a/modules/freifunk/root/etc/config/freifunk b/contrib/package/freifunk-common/files/etc/config/freifunk
index 09d92d92b..09d92d92b 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/contrib/package/freifunk-common/files/etc/config/freifunk
diff --git a/modules/freifunk/root/etc/init.d/freifunk b/contrib/package/freifunk-common/files/etc/init.d/freifunk
index 5ffec43e8..5ffec43e8 100755
--- a/modules/freifunk/root/etc/init.d/freifunk
+++ b/contrib/package/freifunk-common/files/etc/init.d/freifunk
diff --git a/modules/freifunk/root/etc/rc.local.d/01-config-migration b/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration
index 11f1ad60b..11f1ad60b 100644
--- a/modules/freifunk/root/etc/rc.local.d/01-config-migration
+++ b/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration
diff --git a/contrib/package/freifunk-common/files/usr/bin/ffdzero b/contrib/package/freifunk-common/files/usr/bin/ffdzero
new file mode 100755
index 000000000..24e8c2e18
--- /dev/null
+++ b/contrib/package/freifunk-common/files/usr/bin/ffdzero
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+test "$1" = "-h" && echo -e "Usage:\n\t$0 -h\n\t$0 [ { ip | hostname } ]" >&2 && exit 1
+
+host="${1:-leipzig.freifunk.net}"
+
+wget -O /dev/null http://$host/cgi-bin-dev-zero.bin
+test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/dev-zero.bin
+test "$?" = "1" && wget -O /dev/null http://$host/cgi-bin/luci/freifunk/status/zeroes
+test "$?" = "1" && echo "$host: no zero download found..." && exit 1
diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
new file mode 100755
index 000000000..723b813b7
--- /dev/null
+++ b/contrib/package/freifunk-common/files/usr/bin/neigh.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+wget -q -O - http://localhost:2006/neighbours|sed -e's/LinkQuality/LQ/;s/Hysteresis/Hyst./;s/Willingness/Will./'
diff --git a/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
new file mode 100755
index 000000000..aa8de6162
--- /dev/null
+++ b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog
@@ -0,0 +1,29 @@
+#!/usr/bin/lua
+
+require "os"
+require "io"
+require "uci"
+local fs = require "nixio.fs"
+
+if fs.access("/var/run/olsrd.pid") then
+	local stamp, intv
+	local x = uci.cursor()
+
+	x:foreach("olsrd", "LoadPlugin",
+		function(s)
+			if s.library == "olsrd_watchdog.so.0.1" then
+				intv  = tonumber(s.interval)
+				stamp = s.file
+			end
+		end)
+
+	if intv and fs.access(stamp) then
+		local systime = os.time()
+		local wdgtime = tonumber(io.lines(stamp)())
+
+		if not wdgtime or ( systime - wdgtime ) > ( intv * 2 ) then
+			os.execute("logger -t 'OLSR watchdog' 'Process died - restarting!'")
+			os.execute("/etc/init.d/olsrd restart")
+		end
+	end
+end
diff --git a/contrib/package/freifunk-common/files/usr/sbin/ff_rdate b/contrib/package/freifunk-common/files/usr/sbin/ff_rdate
new file mode 100755
index 000000000..dc2c7b2d2
--- /dev/null
+++ b/contrib/package/freifunk-common/files/usr/sbin/ff_rdate
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+uci_get_one() {
+	for var in "$@"; do
+		uci -P /var/state get "$var" 2>/dev/null && break
+	done
+}
+
+local servers="$(uci_get_one 'network.wan.lease_timesrv') $(uci show timeserver | sed -ne 's/.*hostname=//p')"
+
+if [ -n "$servers" ]; then
+	for server in $servers; do
+		rdate -s $server >/dev/null 2>/dev/null && \
+			logger -t rdate "Synced with $server" && break
+
+		logger -t rdate "Failed to sync with $server"
+	done
+else
+	logger -t rdate "No usable time server found"
+fi
diff --git a/contrib/package/freifunk-common/ipkg/postinst b/contrib/package/freifunk-common/ipkg/postinst
new file mode 100755
index 000000000..52bedb2d4
--- /dev/null
+++ b/contrib/package/freifunk-common/ipkg/postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -n "${IPKG_INSTROOT}" ] || {
+	/etc/init.d/freifunk enabled || /etc/init.d/freifunk enable
+	exit 0
+}
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 5595db8f9..8226124ac 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -246,15 +246,11 @@ define Package/luci-mod-admin-core/extra-install
 	touch $(1)/etc/init.d/luci_fixtime || true
 endef
 
-define Package/luci-mod-freifunk/conffiles
-/etc/config/freifunk
-endef
-
 $(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-i18n-english))
 $(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN))
 $(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg))
 $(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json))
-$(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall))
+$(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall +freifunk-common +community-profiles))
 $(eval $(call module,niu,NIU - Next Generation Interface,+luci-mod-admin-core @BROKEN))
 
 
diff --git a/modules/freifunk/root/etc/uci-defaults/freifunk b/modules/freifunk/root/etc/uci-defaults/freifunk
deleted file mode 100644
index fe6586c22..000000000
--- a/modules/freifunk/root/etc/uci-defaults/freifunk
+++ /dev/null
@@ -1,2 +0,0 @@
-uci set uhttpd.main.rfc1918_filter=0
-uci commit uhttpd