From c3a028c76c294c0578b0449d75f9aeaad209c8d1 Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Wed, 28 Sep 2011 00:20:56 +0000 Subject: modules/freifunk: Move profiles and common files into seperate packages, this will enable us to build freifunk images without luci. --- contrib/package/community-profiles/Makefile | 39 +++++++ .../files/etc/config/profile_Freifunk | 10 ++ .../files/etc/config/profile_aachen | 10 ++ .../files/etc/config/profile_augsburg | 18 +++ .../files/etc/config/profile_bayreuth | 20 ++++ .../files/etc/config/profile_bensheim | 9 ++ .../files/etc/config/profile_bergischesland | 15 +++ .../files/etc/config/profile_berlin | 16 +++ .../files/etc/config/profile_carbodebit | 23 ++++ .../files/etc/config/profile_dresden | 12 ++ .../files/etc/config/profile_duesseldorf | 15 +++ .../files/etc/config/profile_evernet | 25 ++++ .../files/etc/config/profile_gadow | 15 +++ .../files/etc/config/profile_guifibages | 19 +++ .../files/etc/config/profile_halle | 9 ++ .../files/etc/config/profile_hamburg | 15 +++ .../files/etc/config/profile_hannover | 12 ++ .../files/etc/config/profile_heppenheim | 9 ++ .../files/etc/config/profile_jena | 12 ++ .../files/etc/config/profile_kiberpipa | 15 +++ .../files/etc/config/profile_l59 | 12 ++ .../files/etc/config/profile_leipzig | 15 +++ .../files/etc/config/profile_mainz | 15 +++ .../files/etc/config/profile_marburg | 12 ++ .../files/etc/config/profile_neuss | 15 +++ .../files/etc/config/profile_oldenburg | 15 +++ .../files/etc/config/profile_openwireless_bern | 18 +++ .../files/etc/config/profile_pberg | 12 ++ .../files/etc/config/profile_piraten_dresden | 12 ++ .../files/etc/config/profile_potsdam | 12 ++ .../files/etc/config/profile_rosbach | 15 +++ .../files/etc/config/profile_seefeld | 13 +++ .../files/etc/config/profile_wlanljubljana | 15 +++ contrib/package/freifunk-common/Makefile | 43 +++++++ .../freifunk-common/files/etc/config/freifunk | 129 +++++++++++++++++++++ .../freifunk-common/files/etc/init.d/freifunk | 29 +++++ .../files/etc/rc.local.d/01-config-migration | 51 ++++++++ .../package/freifunk-common/files/usr/bin/ffdzero | 10 ++ .../package/freifunk-common/files/usr/bin/neigh.sh | 3 + .../files/usr/sbin/ff_olsr_watchdog | 29 +++++ .../freifunk-common/files/usr/sbin/ff_rdate | 20 ++++ contrib/package/freifunk-common/ipkg/postinst | 6 + contrib/package/luci/Makefile | 6 +- modules/freifunk/root/etc/config/freifunk | 129 --------------------- modules/freifunk/root/etc/config/profile_Freifunk | 10 -- modules/freifunk/root/etc/config/profile_aachen | 10 -- modules/freifunk/root/etc/config/profile_augsburg | 18 --- modules/freifunk/root/etc/config/profile_bayreuth | 20 ---- modules/freifunk/root/etc/config/profile_bensheim | 9 -- .../root/etc/config/profile_bergischesland | 15 --- modules/freifunk/root/etc/config/profile_berlin | 16 --- .../freifunk/root/etc/config/profile_carbodebit | 23 ---- modules/freifunk/root/etc/config/profile_dresden | 12 -- .../freifunk/root/etc/config/profile_duesseldorf | 15 --- modules/freifunk/root/etc/config/profile_evernet | 25 ---- modules/freifunk/root/etc/config/profile_gadow | 15 --- .../freifunk/root/etc/config/profile_guifibages | 19 --- modules/freifunk/root/etc/config/profile_halle | 9 -- modules/freifunk/root/etc/config/profile_hamburg | 15 --- modules/freifunk/root/etc/config/profile_hannover | 12 -- .../freifunk/root/etc/config/profile_heppenheim | 9 -- modules/freifunk/root/etc/config/profile_jena | 12 -- modules/freifunk/root/etc/config/profile_kiberpipa | 15 --- modules/freifunk/root/etc/config/profile_l59 | 12 -- modules/freifunk/root/etc/config/profile_leipzig | 15 --- modules/freifunk/root/etc/config/profile_mainz | 15 --- modules/freifunk/root/etc/config/profile_marburg | 12 -- modules/freifunk/root/etc/config/profile_neuss | 15 --- modules/freifunk/root/etc/config/profile_oldenburg | 15 --- .../root/etc/config/profile_openwireless_bern | 18 --- modules/freifunk/root/etc/config/profile_pberg | 12 -- .../root/etc/config/profile_piraten_dresden | 12 -- modules/freifunk/root/etc/config/profile_potsdam | 12 -- modules/freifunk/root/etc/config/profile_rosbach | 15 --- modules/freifunk/root/etc/config/profile_seefeld | 13 --- .../freifunk/root/etc/config/profile_wlanljubljana | 15 --- modules/freifunk/root/etc/init.d/freifunk | 29 ----- .../root/etc/rc.local.d/01-config-migration | 51 -------- modules/freifunk/root/etc/uci-defaults/freifunk | 2 - 79 files changed, 820 insertions(+), 676 deletions(-) create mode 100644 contrib/package/community-profiles/Makefile create mode 100644 contrib/package/community-profiles/files/etc/config/profile_Freifunk create mode 100644 contrib/package/community-profiles/files/etc/config/profile_aachen create mode 100644 contrib/package/community-profiles/files/etc/config/profile_augsburg create mode 100644 contrib/package/community-profiles/files/etc/config/profile_bayreuth create mode 100644 contrib/package/community-profiles/files/etc/config/profile_bensheim create mode 100644 contrib/package/community-profiles/files/etc/config/profile_bergischesland create mode 100644 contrib/package/community-profiles/files/etc/config/profile_berlin create mode 100644 contrib/package/community-profiles/files/etc/config/profile_carbodebit create mode 100644 contrib/package/community-profiles/files/etc/config/profile_dresden create mode 100644 contrib/package/community-profiles/files/etc/config/profile_duesseldorf create mode 100644 contrib/package/community-profiles/files/etc/config/profile_evernet create mode 100644 contrib/package/community-profiles/files/etc/config/profile_gadow create mode 100644 contrib/package/community-profiles/files/etc/config/profile_guifibages create mode 100644 contrib/package/community-profiles/files/etc/config/profile_halle create mode 100644 contrib/package/community-profiles/files/etc/config/profile_hamburg create mode 100644 contrib/package/community-profiles/files/etc/config/profile_hannover create mode 100644 contrib/package/community-profiles/files/etc/config/profile_heppenheim create mode 100644 contrib/package/community-profiles/files/etc/config/profile_jena create mode 100644 contrib/package/community-profiles/files/etc/config/profile_kiberpipa create mode 100644 contrib/package/community-profiles/files/etc/config/profile_l59 create mode 100644 contrib/package/community-profiles/files/etc/config/profile_leipzig create mode 100644 contrib/package/community-profiles/files/etc/config/profile_mainz create mode 100644 contrib/package/community-profiles/files/etc/config/profile_marburg create mode 100644 contrib/package/community-profiles/files/etc/config/profile_neuss create mode 100644 contrib/package/community-profiles/files/etc/config/profile_oldenburg create mode 100644 contrib/package/community-profiles/files/etc/config/profile_openwireless_bern create mode 100644 contrib/package/community-profiles/files/etc/config/profile_pberg create mode 100644 contrib/package/community-profiles/files/etc/config/profile_piraten_dresden create mode 100644 contrib/package/community-profiles/files/etc/config/profile_potsdam create mode 100644 contrib/package/community-profiles/files/etc/config/profile_rosbach create mode 100644 contrib/package/community-profiles/files/etc/config/profile_seefeld create mode 100644 contrib/package/community-profiles/files/etc/config/profile_wlanljubljana create mode 100644 contrib/package/freifunk-common/Makefile create mode 100644 contrib/package/freifunk-common/files/etc/config/freifunk create mode 100755 contrib/package/freifunk-common/files/etc/init.d/freifunk create mode 100644 contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration create mode 100755 contrib/package/freifunk-common/files/usr/bin/ffdzero create mode 100755 contrib/package/freifunk-common/files/usr/bin/neigh.sh create mode 100755 contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog create mode 100755 contrib/package/freifunk-common/files/usr/sbin/ff_rdate create mode 100755 contrib/package/freifunk-common/ipkg/postinst delete mode 100644 modules/freifunk/root/etc/config/freifunk delete mode 100644 modules/freifunk/root/etc/config/profile_Freifunk delete mode 100644 modules/freifunk/root/etc/config/profile_aachen delete mode 100644 modules/freifunk/root/etc/config/profile_augsburg delete mode 100644 modules/freifunk/root/etc/config/profile_bayreuth delete mode 100644 modules/freifunk/root/etc/config/profile_bensheim delete mode 100644 modules/freifunk/root/etc/config/profile_bergischesland delete mode 100644 modules/freifunk/root/etc/config/profile_berlin delete mode 100644 modules/freifunk/root/etc/config/profile_carbodebit delete mode 100644 modules/freifunk/root/etc/config/profile_dresden delete mode 100644 modules/freifunk/root/etc/config/profile_duesseldorf delete mode 100644 modules/freifunk/root/etc/config/profile_evernet delete mode 100644 modules/freifunk/root/etc/config/profile_gadow delete mode 100644 modules/freifunk/root/etc/config/profile_guifibages delete mode 100644 modules/freifunk/root/etc/config/profile_halle delete mode 100644 modules/freifunk/root/etc/config/profile_hamburg delete mode 100644 modules/freifunk/root/etc/config/profile_hannover delete mode 100644 modules/freifunk/root/etc/config/profile_heppenheim delete mode 100644 modules/freifunk/root/etc/config/profile_jena delete mode 100644 modules/freifunk/root/etc/config/profile_kiberpipa delete mode 100644 modules/freifunk/root/etc/config/profile_l59 delete mode 100644 modules/freifunk/root/etc/config/profile_leipzig delete mode 100644 modules/freifunk/root/etc/config/profile_mainz delete mode 100644 modules/freifunk/root/etc/config/profile_marburg delete mode 100644 modules/freifunk/root/etc/config/profile_neuss delete mode 100644 modules/freifunk/root/etc/config/profile_oldenburg delete mode 100644 modules/freifunk/root/etc/config/profile_openwireless_bern delete mode 100644 modules/freifunk/root/etc/config/profile_pberg delete mode 100644 modules/freifunk/root/etc/config/profile_piraten_dresden delete mode 100644 modules/freifunk/root/etc/config/profile_potsdam delete mode 100644 modules/freifunk/root/etc/config/profile_rosbach delete mode 100644 modules/freifunk/root/etc/config/profile_seefeld delete mode 100644 modules/freifunk/root/etc/config/profile_wlanljubljana delete mode 100755 modules/freifunk/root/etc/init.d/freifunk delete mode 100644 modules/freifunk/root/etc/rc.local.d/01-config-migration delete mode 100644 modules/freifunk/root/etc/uci-defaults/freifunk 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 +# 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/contrib/package/community-profiles/files/etc/config/profile_Freifunk b/contrib/package/community-profiles/files/etc/config/profile_Freifunk new file mode 100644 index 000000000..b8f445a73 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_Freifunk @@ -0,0 +1,10 @@ +config 'community' 'profile' + option 'name' 'Freifunk' + option 'homepage' 'http://freifunk.net' + option 'ssid' 'www.freifunk.net' + option 'splash_network' '10.104.0.0/16' + option 'latitude' '52.000' + option 'longitude' '10.000' + option 'splash_prefix' '28' + option 'mesh_network' '10.0.0.0/8' + diff --git a/contrib/package/community-profiles/files/etc/config/profile_aachen b/contrib/package/community-profiles/files/etc/config/profile_aachen new file mode 100644 index 000000000..8445516db --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_aachen @@ -0,0 +1,10 @@ +config 'community' 'profile' + option 'name' 'Aachen' + option 'homepage' 'http://aachen.freifunk.net' + option 'ssid' 'aachen.freifunk.net' + option 'suffix' 'ffc' + option 'latitude' '50.77900' + option 'longitude' '6.05399' + option 'mesh_network' '10.90.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '28' diff --git a/contrib/package/community-profiles/files/etc/config/profile_augsburg b/contrib/package/community-profiles/files/etc/config/profile_augsburg new file mode 100644 index 000000000..d31558585 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_augsburg @@ -0,0 +1,18 @@ +config 'community' 'profile' + option 'name' 'Freifunk Augsburg' + option 'homepage' 'http://augsburg.freifunk.net' + option 'ssid' 'augsburg.freifunk.net' + option 'mesh_network' '10.11.0.0/18' + option 'splash_network' '10.104.0.0/16' + option 'latitude' '48.37071' + option 'longitude' '10.89475' + option 'suffix' 'ffa' + option 'splash_prefix' '27' + +config 'defaults' 'interface' + option 'netmask' '255.255.192.0' + +config 'defaults' 'bssidscheme' + option '1' '02:CA:FF:EE:BA:BE' + option '13' '13:CA:FF:EE:BA:BE' + diff --git a/contrib/package/community-profiles/files/etc/config/profile_bayreuth b/contrib/package/community-profiles/files/etc/config/profile_bayreuth new file mode 100644 index 000000000..90fccbd81 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_bayreuth @@ -0,0 +1,20 @@ +config 'community' 'profile' + option 'name' 'Freifunk Bayreuth' + option 'homepage' 'http://bayreuth.freifunk.net' + option 'ssid' 'bayreuth.freifunk.net' + option 'mesh_network' '10.195.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'latitude' '49.945812' + option 'longitude' '11.575045' + option 'suffix' 'ffbt' + option 'splash_prefix' '28' + +config 'defaults' 'interface' + option 'netmask' '255.255.192.0' + +config 'defaults' 'wifi_device' + option 'channel' '4' + +config 'defaults' 'wifi_iface' + option 'bssid' '42:CA:FF:EE:BA:BE' + diff --git a/contrib/package/community-profiles/files/etc/config/profile_bensheim b/contrib/package/community-profiles/files/etc/config/profile_bensheim new file mode 100644 index 000000000..48c1d47b7 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_bensheim @@ -0,0 +1,9 @@ +config 'community' 'profile' + option 'name' 'Freifunk Bensheim' + option 'homepage' 'http://bensheim.freifunk.net' + option 'ssid' 'bensheim.freifunk.net' + option 'mesh_network' '10.49.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '49.63939' + option 'longitude' '8.633718' diff --git a/contrib/package/community-profiles/files/etc/config/profile_bergischesland b/contrib/package/community-profiles/files/etc/config/profile_bergischesland new file mode 100644 index 000000000..0de454303 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_bergischesland @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Piratenfreifunk Bergisches Land' + option 'homepage' 'http://www.piraten-bergisches-land.de' + option 'ssid' 'PiratenfunkBL' + option 'mesh_network' '10.3.0.0/16' + option 'splash_network' '192.168.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.26849' + option 'longitude' '7.19476' + +config 'defaults' 'wifi_device' + option 'channel' '11' + +config 'defaults' 'wifi_iface' + option 'bssid' '02:40:00:42:42:42' diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin new file mode 100644 index 000000000..c41144e48 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -0,0 +1,16 @@ +config 'community' 'profile' + option 'name' 'Freifunk Berlin' + option 'homepage' 'http://berlin.freifunk.net' + option 'ssid' 'olsr.freifunk.net' + option 'mesh_network' '104.0.0.0/8' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '52.52075' + option 'longitude' '13.40948' + +config 'defaults' 'wifi_device' + option 'channel' '10' + +config 'defaults' 'interface' + option 'netmask' '255.0.0.0' + diff --git a/contrib/package/community-profiles/files/etc/config/profile_carbodebit b/contrib/package/community-profiles/files/etc/config/profile_carbodebit new file mode 100644 index 000000000..0b263f9c0 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_carbodebit @@ -0,0 +1,23 @@ +config 'community' 'profile' + option 'name' 'carbodebit' + option 'homepage' 'http://carbodebit.net' + option 'ssid' 'VHDCARBES' + option 'mesh_network' '10.72.1.0/24' + option 'latitude' '43.633683' + option 'longitude' '2.160894' + +config 'defaults' 'wifi_iface' + option 'bssid' 'DE:78:70:E4:FA:B8' + +config 'defaults' 'interface' + option 'netmask' '255.255.255.0' + option 'dns' '10.70.1.1 213.190.64.170 213.190.64.166' + +config 'defaults' 'wifi_device' + option 'channel' '11' + option 'country' 'FR' + option 'distance' '2000' + +config 'defaults' 'bssidscheme' + option 'all' 'DE:78:70:E4:FA:B8' + diff --git a/contrib/package/community-profiles/files/etc/config/profile_dresden b/contrib/package/community-profiles/files/etc/config/profile_dresden new file mode 100644 index 000000000..6b5dc879a --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_dresden @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Freifunk Dresden' + option 'homepage' 'http://ddmesh.de/' + option 'ssid' 'dresden.freifunk.net' + option 'mesh_network' '10.12.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.05081' + option 'longitude' '13.73420' + +config 'defaults' 'wifi_device' + option 'channel' '1' diff --git a/contrib/package/community-profiles/files/etc/config/profile_duesseldorf b/contrib/package/community-profiles/files/etc/config/profile_duesseldorf new file mode 100644 index 000000000..cb36aabf6 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_duesseldorf @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Duesseldorf' + option 'homepage' 'http://freifunk-duesseldorf.de' + option 'ssid' 'duesseldorf.freifunk.net' + option 'mesh_network' '10.40.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.217812' + option 'longitude' '6.761564' + +config 'defaults' 'wifi_device' + option 'channel' '3' + +config 'defaults' 'wifi_iface' + option 'bssid' '02:CA:FF:EE:BA:BE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_evernet b/contrib/package/community-profiles/files/etc/config/profile_evernet new file mode 100644 index 000000000..05453608d --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_evernet @@ -0,0 +1,25 @@ +config 'community' 'profile' + option 'name' 'Freifunk Evernet eG' + option 'homepage' 'http://www.evernet-eg.de' + option 'ssid' 'evernet.freifunk.net' + option 'mesh_network' '10.0.0.0/8' + option 'latitude' '51.15692062509162' + option 'longitude' '10.716041922569275' + option 'suffix' 'evernet' + +config 'defaults' 'interface' + option 'netmask' '255.0.0.0' + +config 'defaults' 'bssidscheme' + option 'all' '02:CA:FF:EE:BA:BE' + +config 'defaults' 'wifi_device' + option 'channel' '13' + option 'country' 'DE' + option 'txpower' '19' + option 'beacon_int' '5000' + option 'distance' '1500' + option 'noscan' '0' + +config 'defaults' 'wifi_iface' + option 'mcast_rate' '6000' diff --git a/contrib/package/community-profiles/files/etc/config/profile_gadow b/contrib/package/community-profiles/files/etc/config/profile_gadow new file mode 100644 index 000000000..79466f181 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_gadow @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Gadow' + option 'homepage' 'http://gadow.freifunk.net' + option 'ssid' 'gadow.freifunk.net' + option 'mesh_network' '104.0.0.0/8' + option 'splash_network' '10.61.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '53.11' + option 'longitude' '12.61' + +config 'defaults' 'interface' + option 'netmask' '255.0.0.0' + +config 'defaults' 'bssidscheme' + option '1' '02:CA:FF:EE:BA:BE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_guifibages b/contrib/package/community-profiles/files/etc/config/profile_guifibages new file mode 100644 index 000000000..a0fc4fc1e --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_guifibages @@ -0,0 +1,19 @@ +config 'community' 'profile' + option 'name' 'Guifi Bages' + option 'homepage' 'http://guifi.net/PlaBages' + option 'ssid' 'guifibages' + option 'mesh_network' '10.224.3.0/16' + option 'splash_network' '10.104.0.0/16' + option 'theme' 'luci-theme-freifunk-generic' + option 'latitude' '41.718437' + option 'longitude' '1.826477' + option 'suffix' 'guifibages.cat' + option 'splash_prefix' '27' + option 'extrapackages' 'luci-app-olsr-viz luci-i18n-catalan' + +config 'defaults' 'interface' + option 'netmask' '255.255.0.0' + +config 'defaults' 'bssidscheme' + option 'all' '12:34:56:78:9a:bc' + diff --git a/contrib/package/community-profiles/files/etc/config/profile_halle b/contrib/package/community-profiles/files/etc/config/profile_halle new file mode 100644 index 000000000..2680087ba --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_halle @@ -0,0 +1,9 @@ +config 'community' 'profile' + option 'name' 'Freifunk Halle' + option 'homepage' 'http://halle.freifunk.net' + option 'ssid' 'halle.freifunk.net' + option 'mesh_network' '104.62.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.47911' + option 'longitude' '11.96901' diff --git a/contrib/package/community-profiles/files/etc/config/profile_hamburg b/contrib/package/community-profiles/files/etc/config/profile_hamburg new file mode 100644 index 000000000..ba1dd2170 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_hamburg @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Hamburg' + option 'homepage' 'http://hamburg.piratenpartei.de' + option 'ssid' 'hamburg.freifunk.net' + option 'mesh_network' '10.112.0.0/12' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '53.56262' + option 'longitude' '10.01069' + +config 'defaults' 'interface' + option 'netmask' '255.240.0.0' + +config 'defaults' 'wifi_device' + option 'channel' '1' diff --git a/contrib/package/community-profiles/files/etc/config/profile_hannover b/contrib/package/community-profiles/files/etc/config/profile_hannover new file mode 100644 index 000000000..008b6c70e --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_hannover @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Freifunk Hannover' + option 'homepage' 'http://hannover.freifunk.net' + option 'ssid' 'hannover.freifunk.net' + option 'mesh_network' '10.2.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '52.38427' + option 'longitude' '9.74359' + +config 'defaults' 'wifi_iface' + option 'bssid' 'CA:FF:EE:CA:FF:EE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_heppenheim b/contrib/package/community-profiles/files/etc/config/profile_heppenheim new file mode 100644 index 000000000..a8304946b --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_heppenheim @@ -0,0 +1,9 @@ +config 'community' 'profile' + option 'name' 'Freifunk Heppenheim' + option 'homepage' 'http://heppenheim.freifunk.net' + option 'ssid' 'heppenheim.freifunk.net' + option 'mesh_network' '10.48.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.151786' + option 'longitude' '10.415039' diff --git a/contrib/package/community-profiles/files/etc/config/profile_jena b/contrib/package/community-profiles/files/etc/config/profile_jena new file mode 100644 index 000000000..5741d09b2 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_jena @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Freifunk Jena' + option 'homepage' 'http://www.freifunk-jena.de' + option 'ssid' 'www.freifunk-jena.de' + option 'mesh_network' '10.127.0.0/20' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '29' + option 'latitude' '50.92779' + option 'longitude' '11.58431' + +config 'defaults' 'interface' + option 'dns' '217.11.48.200 217.11.49.200 8.8.8.8' diff --git a/contrib/package/community-profiles/files/etc/config/profile_kiberpipa b/contrib/package/community-profiles/files/etc/config/profile_kiberpipa new file mode 100644 index 000000000..c2a96e47c --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_kiberpipa @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Kiberpipa.net' + option 'homepage' 'http://www.kiberpipa.net' + option 'ssid' 'open.kiberpipa.net' + option 'mesh_network' '10.14.0.0/16' + option 'splash_network' '10.14.128.0/17' + option 'splash_prefix' '27' + option 'latitude' '46.05063' + option 'longitude' '14.50402' + +config 'defaults' 'wifi_device' + option 'channel' '8' + +config 'defaults' 'interface' + option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222' diff --git a/contrib/package/community-profiles/files/etc/config/profile_l59 b/contrib/package/community-profiles/files/etc/config/profile_l59 new file mode 100644 index 000000000..6185f0257 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_l59 @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Freifunk L59' + option 'homepage' 'http://freifunk.net' + option 'ssid' 'start.freifunk.net' + option 'mesh_network' '104.59.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '52.26337' + option 'longitude' '10.52103' + +config 'defaults' 'bssidscheme' + option '1' '02:CA:FF:EE:BA:BE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_leipzig b/contrib/package/community-profiles/files/etc/config/profile_leipzig new file mode 100644 index 000000000..17f3cad41 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_leipzig @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Leipzig' + option 'homepage' 'http://leipzig.freifunk.net' + option 'ssid' 'leipzig.freifunk.net' + option 'mesh_network' '104.61.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.33348' + option 'longitude' '12.40297' + +config 'defaults' 'interface' + option 'netmask' '255.0.0.0' + +config 'defaults' 'bssidscheme' + option '1' '02:CA:FF:EE:BA:BE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_mainz b/contrib/package/community-profiles/files/etc/config/profile_mainz new file mode 100644 index 000000000..2d086183e --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_mainz @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Mainz' + option 'homepage' 'http://mainz.freifunk.net' + option 'ssid' 'mainz.freifunk.net' + option 'mesh_network' '10.37.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '49.99635' + option 'longitude' '8.27417' + +config 'defaults' 'wifi_iface' + option 'bssid' '02:ca:ff:ee:ba:be' + +config 'defaults' 'wifi_device' + option 'channel' '1' diff --git a/contrib/package/community-profiles/files/etc/config/profile_marburg b/contrib/package/community-profiles/files/etc/config/profile_marburg new file mode 100644 index 000000000..18cff80e5 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_marburg @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Freifunk Marburg' + option 'homepage' ' http://marburg.freifunk.de' + option 'ssid' 'marburg.freifunk.net' + option 'mesh_network' '10.128.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '29' + option 'latitude' '49.63939' + option 'longitude' '8.633718' + +config 'defaults' 'interface' + option 'dns' '8.8.8.8 212.204.49.83' diff --git a/contrib/package/community-profiles/files/etc/config/profile_neuss b/contrib/package/community-profiles/files/etc/config/profile_neuss new file mode 100644 index 000000000..8e3061730 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_neuss @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Neuss' + option 'homepage' 'http://neuss.freifunk.net' + option 'ssid' 'neuss.freifunk.net' + option 'mesh_network' '172.28.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.19045' + option 'longitude' '6.69471' + +config 'defaults' 'wifi_device' + option 'channel' '11' + +config 'defaults' 'wifi_iface' + option 'bssid' 'DE:AD:BE:EF:CA:FE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_oldenburg b/contrib/package/community-profiles/files/etc/config/profile_oldenburg new file mode 100644 index 000000000..e967fdb43 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_oldenburg @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Oldenburg' + option 'homepage' 'http://oldenburg.freifunk.net' + option 'ssid' 'oldenburg.freifunk.net' + option 'mesh_network' '10.18.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '53.14083' + option 'longitude' '8.21314' + +config 'defaults' 'wifi_device' + option 'channel' '6' + +config 'defaults' 'wifi_iface' + option 'bssid' '02:CA:FF:EE:BA:BE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern b/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern new file mode 100644 index 000000000..810ad8f1c --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_openwireless_bern @@ -0,0 +1,18 @@ +config 'community' 'profile' + option 'name' 'Openwireless Bern' + option 'homepage' 'http://bern.openwireless.ch/' + option 'ssid' 'www.openwireless.ch' + option 'mesh_network' '10.247.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '50.814788' + option 'longitude' '8.769239' + +config 'defaults' 'interface' + option 'dns' '208.67.222.222 208.67.220.220' + +config 'defaults' 'wifi_device' + option 'channel' '10' + option 'country' '756' + + diff --git a/contrib/package/community-profiles/files/etc/config/profile_pberg b/contrib/package/community-profiles/files/etc/config/profile_pberg new file mode 100644 index 000000000..ea2f7b081 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_pberg @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Freifunk Berlin Prenzlauer Berg' + option 'homepage' 'http://pberg.freifunk.net' + option 'ssid' 'olsr.freifunk.net' + option 'mesh_network' '104.0.0.0/8' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '52.5427' + option 'longitude' '13.4172' + +config 'defaults' 'wifi_device' + option 'channel' '10' diff --git a/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden b/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden new file mode 100644 index 000000000..2af0e319d --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_piraten_dresden @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Piratenfreifunk Dresden' + option 'homepage' 'http://www.piraten-sachsen.de/' + option 'ssid' 'dresden.freifunk.net' + option 'mesh_network' '10.12.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '51.05081' + option 'longitude' '13.73420' + +config 'defaults' 'wifi_device' + option 'channel' '1' diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam new file mode 100644 index 000000000..a70a29ee5 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam @@ -0,0 +1,12 @@ +config 'community' 'profile' + option 'name' 'Freifunk Potsdam' + option 'homepage' 'http://potsdam.freifunk.net' + option 'ssid' 'www.freifunk-potsdam.de' + option 'mesh_network' '10.22.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '52.39349' + option 'longitude' '13.06489' + +config 'defaults' 'wifi_device' + option 'channel' '13' diff --git a/contrib/package/community-profiles/files/etc/config/profile_rosbach b/contrib/package/community-profiles/files/etc/config/profile_rosbach new file mode 100644 index 000000000..4444f7099 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_rosbach @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'Freifunk Rosbach' + option 'homepage' 'freifunk-rosbach.de' + option 'ssid' 'rosbach.freifunk.net' + option 'mesh_network' '10.212.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '50.18' + option 'longitude' '8.42' + +config 'defaults' 'wifi_device' + option 'channel' '13' + +config 'defaults' 'wifi_iface' + option 'bssid' 'D2:CA:FF:EE:BA:BE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_seefeld b/contrib/package/community-profiles/files/etc/config/profile_seefeld new file mode 100644 index 000000000..5d03f7d04 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_seefeld @@ -0,0 +1,13 @@ +config 'community' 'profile' + option 'name' 'Freifunk Seefeld' + option 'homepage' 'http://wiki.freifunk.net/Seefeld.freifunk.net' + option 'ssid' 'seefeld.freifunk.net' + option 'mesh_network' '10.111.0.0/16' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '48.03485' + option 'longitude' '11.21279' + +config 'defaults' 'wifi_device' + option 'channel' '1' + option 'bssid' '02:CA:FF:EE:BA:BB' diff --git a/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana b/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana new file mode 100644 index 000000000..eeefbd22b --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_wlanljubljana @@ -0,0 +1,15 @@ +config 'community' 'profile' + option 'name' 'wlan ljubljana' + option 'homepage' 'http://wlan-lj.net' + option 'ssid' 'open.wlan-lj.net' + option 'mesh_network' '10.254.0.0/16' + option 'splash_network' '10.254.120.0/21' + option 'splash_prefix' '27' + option 'latitude' '46.05063' + option 'longitude' '14.50402' + +config 'defaults' 'wifi_device' + option 'channel' '8' + +config 'defaults' 'interface' + option 'dns' '10.254.0.1 10.254.0.2' 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 +# 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/contrib/package/freifunk-common/files/etc/config/freifunk b/contrib/package/freifunk-common/files/etc/config/freifunk new file mode 100644 index 000000000..09d92d92b --- /dev/null +++ b/contrib/package/freifunk-common/files/etc/config/freifunk @@ -0,0 +1,129 @@ +package 'freifunk' + +config 'public' 'contact' + option 'nickname' '' + option 'name' '' + option 'mail' '' + option 'phone' '' + option 'location' '' + option 'note' '' + +config 'public' 'community' + option 'name' 'Freifunk' + option 'homepage' 'http://freifunk.net' + +config 'fw_zone' 'zone_freifunk' + option 'name' 'freifunk' + option 'input' 'REJECT' + option 'forward' 'REJECT' + option 'output' 'ACCEPT' + +config 'fw_rule' 'fficmp' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'icmp' + +config 'fw_rule' 'ffhttp' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'tcp' + option 'dest_port' '80' + +config 'fw_rule' 'ffhttps' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'tcp' + option 'dest_port' '443' + +config 'fw_rule' 'ffssh' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'tcp' + option 'dest_port' '22' + +config 'fw_rule' 'ffolsr' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'udp' + option 'dest_port' '698' + +config 'fw_rule' 'ffwprobe' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'tcp' + option 'dest_port' '17990' + +config 'fw_rule' 'ffdns' + option 'dest_port' '53' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'udp' + +config 'fw_rule' 'ffdhcp' + option 'src_port' '68' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'dest_port' '67' + option 'proto' 'udp' + option 'leasetime' '30m' + +config 'fw_rule' 'ffsplash' + option 'dest_port' '8082' + option 'src' 'freifunk' + option 'target' 'ACCEPT' + option 'proto' 'tcp' + +config 'fw_forwarding' 'lanfffwd' + option 'src' 'lan' + option 'dest' 'freifunk' + +config 'fw_forwarding' 'ffwanfwd' + option 'src' 'freifunk' + option 'dest' 'wan' + +config 'fw_forwarding' 'fffwd' + option 'src' 'freifunk' + option 'dest' 'freifunk' + +config 'include' 'freifunk' + option 'path' '/etc/firewall.freifunk' + +config 'defaults' 'system' + option 'zonename' 'Europe/Berlin' + option 'timezone' 'CET-1CEST,M3.5.0,M10.5.0/3' + +config 'defaults' 'wifi_device' + option 'channel' '1' + option 'diversity' '1' + option 'disabled' '0' + option 'country' 'DE' + option 'hwmode' '11g' + option 'distance' '1000' + +config 'defaults' 'wifi_iface' + option 'mode' 'adhoc' + option 'encryption' 'none' + option 'bgscan' '0' + option 'bssid' '12:CA:FF:EE:BA:BE' + option 'sw_merge' '1' + option 'mcast_rate' '5500' + option 'probereq' '1' + +config 'defaults' 'interface' + option 'netmask' '255.255.0.0' + option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1' + +config 'defaults' 'alias' + option 'netmask' '255.255.255.0' + +config 'defaults' 'dhcp' + option 'leasetime' '30m' + option 'force' '1' + +config 'defaults' 'olsr_interfacedefaults' + option 'Ip4Broadcast' '255.255.255.255' + +config 'defaults' 'upgrade' + option 'repository' 'http://dev.luci.freifunk-halle.net/freifunk-snapshots' + option 'rssfeed' 'http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml' + diff --git a/contrib/package/freifunk-common/files/etc/init.d/freifunk b/contrib/package/freifunk-common/files/etc/init.d/freifunk new file mode 100755 index 000000000..5ffec43e8 --- /dev/null +++ b/contrib/package/freifunk-common/files/etc/init.d/freifunk @@ -0,0 +1,29 @@ +#!/bin/sh /etc/rc.common +# Freifunk Init +# $Id$ + +START=99 + +boot() { + test -f /etc/crontabs/root || touch /etc/crontabs/root + + grep -q 'killall -HUP dnsmasq' /etc/crontabs/root || { + echo "*/5 * * * * killall -HUP dnsmasq" >> /etc/crontabs/root + } + + grep -q '/usr/sbin/ff_olsr_watchdog' /etc/crontabs/root || { + echo "*/5 * * * * /usr/sbin/ff_olsr_watchdog" >> /etc/crontabs/root + } + + grep -q '/usr/sbin/ff_rdate' /etc/crontabs/root || { + echo "0 */4 * * * /usr/sbin/ff_rdate" >> /etc/crontabs/root + } + + [ -d /etc/rc.local.d ] && { + for file in /etc/rc.local.d/*; do + test -f "$file" && . "$file" + done + } + + ( sleep 40; /usr/sbin/ff_rdate; /etc/init.d/cron restart ) & +} diff --git a/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration b/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration new file mode 100644 index 000000000..11f1ad60b --- /dev/null +++ b/contrib/package/freifunk-common/files/etc/rc.local.d/01-config-migration @@ -0,0 +1,51 @@ +# Fixup various configurations to remove quirks +# from former versions. + +_log() { + logger -t "Config Migration" "$1" +} + +_uci() { + uci ${2:+-c $2} get "$1" 2>/dev/null +} + + +# Splash redirector had a wrong virtual url match +# which resulted in "No such handler" + +[ "$(_uci lucid.splashredir.virtual)" == "/" ] && { + _log "Fix splash redirector configuration" + uci set lucid.splashredir.virtual='' + uci commit lucid + /etc/init.d/lucid restart +} + + +# Newer OLSR versions have the MinTCVtime hack active, +# ensure proper timings or olsrd won't start + +FIX=0 +for i in 0 1 2 3 4; do + [ -z "$(_uci olsrd.@Interface[$i].TcInterval)" ] && \ + [ -z "$(_uci olsrd.@Interface[$i].TcValidityTime)" ] || { + uci delete olsrd.@Interface[$i].TcInterval + uci delete olsrd.@Interface[$i].TcValidityTime + FIX=1 + } +done + +[ "$FIX" == 1 ] && { + _log "Fix olsrd configuration for MinTCVTime hack" + uci commit olsrd + /etc/init.d/olsrd restart +} + + +# Ensure that the community definitions are in the +# new format + +[ -z "$(_uci freifunk.leipzig.mesh_network)" ] && \ +[ -n "$(_uci freifunk.leipzig.mesh_network /rom/etc/config)" ] && { + _log "Converting freifunk configuration to new format" + cp /rom/etc/config/freifunk /etc/config/freifunk +} 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/config/freifunk b/modules/freifunk/root/etc/config/freifunk deleted file mode 100644 index 09d92d92b..000000000 --- a/modules/freifunk/root/etc/config/freifunk +++ /dev/null @@ -1,129 +0,0 @@ -package 'freifunk' - -config 'public' 'contact' - option 'nickname' '' - option 'name' '' - option 'mail' '' - option 'phone' '' - option 'location' '' - option 'note' '' - -config 'public' 'community' - option 'name' 'Freifunk' - option 'homepage' 'http://freifunk.net' - -config 'fw_zone' 'zone_freifunk' - option 'name' 'freifunk' - option 'input' 'REJECT' - option 'forward' 'REJECT' - option 'output' 'ACCEPT' - -config 'fw_rule' 'fficmp' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'icmp' - -config 'fw_rule' 'ffhttp' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'tcp' - option 'dest_port' '80' - -config 'fw_rule' 'ffhttps' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'tcp' - option 'dest_port' '443' - -config 'fw_rule' 'ffssh' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'tcp' - option 'dest_port' '22' - -config 'fw_rule' 'ffolsr' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'udp' - option 'dest_port' '698' - -config 'fw_rule' 'ffwprobe' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'tcp' - option 'dest_port' '17990' - -config 'fw_rule' 'ffdns' - option 'dest_port' '53' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'udp' - -config 'fw_rule' 'ffdhcp' - option 'src_port' '68' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'dest_port' '67' - option 'proto' 'udp' - option 'leasetime' '30m' - -config 'fw_rule' 'ffsplash' - option 'dest_port' '8082' - option 'src' 'freifunk' - option 'target' 'ACCEPT' - option 'proto' 'tcp' - -config 'fw_forwarding' 'lanfffwd' - option 'src' 'lan' - option 'dest' 'freifunk' - -config 'fw_forwarding' 'ffwanfwd' - option 'src' 'freifunk' - option 'dest' 'wan' - -config 'fw_forwarding' 'fffwd' - option 'src' 'freifunk' - option 'dest' 'freifunk' - -config 'include' 'freifunk' - option 'path' '/etc/firewall.freifunk' - -config 'defaults' 'system' - option 'zonename' 'Europe/Berlin' - option 'timezone' 'CET-1CEST,M3.5.0,M10.5.0/3' - -config 'defaults' 'wifi_device' - option 'channel' '1' - option 'diversity' '1' - option 'disabled' '0' - option 'country' 'DE' - option 'hwmode' '11g' - option 'distance' '1000' - -config 'defaults' 'wifi_iface' - option 'mode' 'adhoc' - option 'encryption' 'none' - option 'bgscan' '0' - option 'bssid' '12:CA:FF:EE:BA:BE' - option 'sw_merge' '1' - option 'mcast_rate' '5500' - option 'probereq' '1' - -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1' - -config 'defaults' 'alias' - option 'netmask' '255.255.255.0' - -config 'defaults' 'dhcp' - option 'leasetime' '30m' - option 'force' '1' - -config 'defaults' 'olsr_interfacedefaults' - option 'Ip4Broadcast' '255.255.255.255' - -config 'defaults' 'upgrade' - option 'repository' 'http://dev.luci.freifunk-halle.net/freifunk-snapshots' - option 'rssfeed' 'http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml' - diff --git a/modules/freifunk/root/etc/config/profile_Freifunk b/modules/freifunk/root/etc/config/profile_Freifunk deleted file mode 100644 index b8f445a73..000000000 --- a/modules/freifunk/root/etc/config/profile_Freifunk +++ /dev/null @@ -1,10 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk' - option 'homepage' 'http://freifunk.net' - option 'ssid' 'www.freifunk.net' - option 'splash_network' '10.104.0.0/16' - option 'latitude' '52.000' - option 'longitude' '10.000' - option 'splash_prefix' '28' - option 'mesh_network' '10.0.0.0/8' - diff --git a/modules/freifunk/root/etc/config/profile_aachen b/modules/freifunk/root/etc/config/profile_aachen deleted file mode 100644 index 8445516db..000000000 --- a/modules/freifunk/root/etc/config/profile_aachen +++ /dev/null @@ -1,10 +0,0 @@ -config 'community' 'profile' - option 'name' 'Aachen' - option 'homepage' 'http://aachen.freifunk.net' - option 'ssid' 'aachen.freifunk.net' - option 'suffix' 'ffc' - option 'latitude' '50.77900' - option 'longitude' '6.05399' - option 'mesh_network' '10.90.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '28' diff --git a/modules/freifunk/root/etc/config/profile_augsburg b/modules/freifunk/root/etc/config/profile_augsburg deleted file mode 100644 index d31558585..000000000 --- a/modules/freifunk/root/etc/config/profile_augsburg +++ /dev/null @@ -1,18 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Augsburg' - option 'homepage' 'http://augsburg.freifunk.net' - option 'ssid' 'augsburg.freifunk.net' - option 'mesh_network' '10.11.0.0/18' - option 'splash_network' '10.104.0.0/16' - option 'latitude' '48.37071' - option 'longitude' '10.89475' - option 'suffix' 'ffa' - option 'splash_prefix' '27' - -config 'defaults' 'interface' - option 'netmask' '255.255.192.0' - -config 'defaults' 'bssidscheme' - option '1' '02:CA:FF:EE:BA:BE' - option '13' '13:CA:FF:EE:BA:BE' - diff --git a/modules/freifunk/root/etc/config/profile_bayreuth b/modules/freifunk/root/etc/config/profile_bayreuth deleted file mode 100644 index 90fccbd81..000000000 --- a/modules/freifunk/root/etc/config/profile_bayreuth +++ /dev/null @@ -1,20 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Bayreuth' - option 'homepage' 'http://bayreuth.freifunk.net' - option 'ssid' 'bayreuth.freifunk.net' - option 'mesh_network' '10.195.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'latitude' '49.945812' - option 'longitude' '11.575045' - option 'suffix' 'ffbt' - option 'splash_prefix' '28' - -config 'defaults' 'interface' - option 'netmask' '255.255.192.0' - -config 'defaults' 'wifi_device' - option 'channel' '4' - -config 'defaults' 'wifi_iface' - option 'bssid' '42:CA:FF:EE:BA:BE' - diff --git a/modules/freifunk/root/etc/config/profile_bensheim b/modules/freifunk/root/etc/config/profile_bensheim deleted file mode 100644 index 48c1d47b7..000000000 --- a/modules/freifunk/root/etc/config/profile_bensheim +++ /dev/null @@ -1,9 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Bensheim' - option 'homepage' 'http://bensheim.freifunk.net' - option 'ssid' 'bensheim.freifunk.net' - option 'mesh_network' '10.49.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '49.63939' - option 'longitude' '8.633718' diff --git a/modules/freifunk/root/etc/config/profile_bergischesland b/modules/freifunk/root/etc/config/profile_bergischesland deleted file mode 100644 index 0de454303..000000000 --- a/modules/freifunk/root/etc/config/profile_bergischesland +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Piratenfreifunk Bergisches Land' - option 'homepage' 'http://www.piraten-bergisches-land.de' - option 'ssid' 'PiratenfunkBL' - option 'mesh_network' '10.3.0.0/16' - option 'splash_network' '192.168.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.26849' - option 'longitude' '7.19476' - -config 'defaults' 'wifi_device' - option 'channel' '11' - -config 'defaults' 'wifi_iface' - option 'bssid' '02:40:00:42:42:42' diff --git a/modules/freifunk/root/etc/config/profile_berlin b/modules/freifunk/root/etc/config/profile_berlin deleted file mode 100644 index c41144e48..000000000 --- a/modules/freifunk/root/etc/config/profile_berlin +++ /dev/null @@ -1,16 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Berlin' - option 'homepage' 'http://berlin.freifunk.net' - option 'ssid' 'olsr.freifunk.net' - option 'mesh_network' '104.0.0.0/8' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '52.52075' - option 'longitude' '13.40948' - -config 'defaults' 'wifi_device' - option 'channel' '10' - -config 'defaults' 'interface' - option 'netmask' '255.0.0.0' - diff --git a/modules/freifunk/root/etc/config/profile_carbodebit b/modules/freifunk/root/etc/config/profile_carbodebit deleted file mode 100644 index 0b263f9c0..000000000 --- a/modules/freifunk/root/etc/config/profile_carbodebit +++ /dev/null @@ -1,23 +0,0 @@ -config 'community' 'profile' - option 'name' 'carbodebit' - option 'homepage' 'http://carbodebit.net' - option 'ssid' 'VHDCARBES' - option 'mesh_network' '10.72.1.0/24' - option 'latitude' '43.633683' - option 'longitude' '2.160894' - -config 'defaults' 'wifi_iface' - option 'bssid' 'DE:78:70:E4:FA:B8' - -config 'defaults' 'interface' - option 'netmask' '255.255.255.0' - option 'dns' '10.70.1.1 213.190.64.170 213.190.64.166' - -config 'defaults' 'wifi_device' - option 'channel' '11' - option 'country' 'FR' - option 'distance' '2000' - -config 'defaults' 'bssidscheme' - option 'all' 'DE:78:70:E4:FA:B8' - diff --git a/modules/freifunk/root/etc/config/profile_dresden b/modules/freifunk/root/etc/config/profile_dresden deleted file mode 100644 index 6b5dc879a..000000000 --- a/modules/freifunk/root/etc/config/profile_dresden +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Dresden' - option 'homepage' 'http://ddmesh.de/' - option 'ssid' 'dresden.freifunk.net' - option 'mesh_network' '10.12.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.05081' - option 'longitude' '13.73420' - -config 'defaults' 'wifi_device' - option 'channel' '1' diff --git a/modules/freifunk/root/etc/config/profile_duesseldorf b/modules/freifunk/root/etc/config/profile_duesseldorf deleted file mode 100644 index cb36aabf6..000000000 --- a/modules/freifunk/root/etc/config/profile_duesseldorf +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Duesseldorf' - option 'homepage' 'http://freifunk-duesseldorf.de' - option 'ssid' 'duesseldorf.freifunk.net' - option 'mesh_network' '10.40.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.217812' - option 'longitude' '6.761564' - -config 'defaults' 'wifi_device' - option 'channel' '3' - -config 'defaults' 'wifi_iface' - option 'bssid' '02:CA:FF:EE:BA:BE' diff --git a/modules/freifunk/root/etc/config/profile_evernet b/modules/freifunk/root/etc/config/profile_evernet deleted file mode 100644 index 05453608d..000000000 --- a/modules/freifunk/root/etc/config/profile_evernet +++ /dev/null @@ -1,25 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Evernet eG' - option 'homepage' 'http://www.evernet-eg.de' - option 'ssid' 'evernet.freifunk.net' - option 'mesh_network' '10.0.0.0/8' - option 'latitude' '51.15692062509162' - option 'longitude' '10.716041922569275' - option 'suffix' 'evernet' - -config 'defaults' 'interface' - option 'netmask' '255.0.0.0' - -config 'defaults' 'bssidscheme' - option 'all' '02:CA:FF:EE:BA:BE' - -config 'defaults' 'wifi_device' - option 'channel' '13' - option 'country' 'DE' - option 'txpower' '19' - option 'beacon_int' '5000' - option 'distance' '1500' - option 'noscan' '0' - -config 'defaults' 'wifi_iface' - option 'mcast_rate' '6000' diff --git a/modules/freifunk/root/etc/config/profile_gadow b/modules/freifunk/root/etc/config/profile_gadow deleted file mode 100644 index 79466f181..000000000 --- a/modules/freifunk/root/etc/config/profile_gadow +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Gadow' - option 'homepage' 'http://gadow.freifunk.net' - option 'ssid' 'gadow.freifunk.net' - option 'mesh_network' '104.0.0.0/8' - option 'splash_network' '10.61.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '53.11' - option 'longitude' '12.61' - -config 'defaults' 'interface' - option 'netmask' '255.0.0.0' - -config 'defaults' 'bssidscheme' - option '1' '02:CA:FF:EE:BA:BE' diff --git a/modules/freifunk/root/etc/config/profile_guifibages b/modules/freifunk/root/etc/config/profile_guifibages deleted file mode 100644 index a0fc4fc1e..000000000 --- a/modules/freifunk/root/etc/config/profile_guifibages +++ /dev/null @@ -1,19 +0,0 @@ -config 'community' 'profile' - option 'name' 'Guifi Bages' - option 'homepage' 'http://guifi.net/PlaBages' - option 'ssid' 'guifibages' - option 'mesh_network' '10.224.3.0/16' - option 'splash_network' '10.104.0.0/16' - option 'theme' 'luci-theme-freifunk-generic' - option 'latitude' '41.718437' - option 'longitude' '1.826477' - option 'suffix' 'guifibages.cat' - option 'splash_prefix' '27' - option 'extrapackages' 'luci-app-olsr-viz luci-i18n-catalan' - -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - -config 'defaults' 'bssidscheme' - option 'all' '12:34:56:78:9a:bc' - diff --git a/modules/freifunk/root/etc/config/profile_halle b/modules/freifunk/root/etc/config/profile_halle deleted file mode 100644 index 2680087ba..000000000 --- a/modules/freifunk/root/etc/config/profile_halle +++ /dev/null @@ -1,9 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Halle' - option 'homepage' 'http://halle.freifunk.net' - option 'ssid' 'halle.freifunk.net' - option 'mesh_network' '104.62.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.47911' - option 'longitude' '11.96901' diff --git a/modules/freifunk/root/etc/config/profile_hamburg b/modules/freifunk/root/etc/config/profile_hamburg deleted file mode 100644 index ba1dd2170..000000000 --- a/modules/freifunk/root/etc/config/profile_hamburg +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Hamburg' - option 'homepage' 'http://hamburg.piratenpartei.de' - option 'ssid' 'hamburg.freifunk.net' - option 'mesh_network' '10.112.0.0/12' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '53.56262' - option 'longitude' '10.01069' - -config 'defaults' 'interface' - option 'netmask' '255.240.0.0' - -config 'defaults' 'wifi_device' - option 'channel' '1' diff --git a/modules/freifunk/root/etc/config/profile_hannover b/modules/freifunk/root/etc/config/profile_hannover deleted file mode 100644 index 008b6c70e..000000000 --- a/modules/freifunk/root/etc/config/profile_hannover +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Hannover' - option 'homepage' 'http://hannover.freifunk.net' - option 'ssid' 'hannover.freifunk.net' - option 'mesh_network' '10.2.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '52.38427' - option 'longitude' '9.74359' - -config 'defaults' 'wifi_iface' - option 'bssid' 'CA:FF:EE:CA:FF:EE' diff --git a/modules/freifunk/root/etc/config/profile_heppenheim b/modules/freifunk/root/etc/config/profile_heppenheim deleted file mode 100644 index a8304946b..000000000 --- a/modules/freifunk/root/etc/config/profile_heppenheim +++ /dev/null @@ -1,9 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Heppenheim' - option 'homepage' 'http://heppenheim.freifunk.net' - option 'ssid' 'heppenheim.freifunk.net' - option 'mesh_network' '10.48.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.151786' - option 'longitude' '10.415039' diff --git a/modules/freifunk/root/etc/config/profile_jena b/modules/freifunk/root/etc/config/profile_jena deleted file mode 100644 index 5741d09b2..000000000 --- a/modules/freifunk/root/etc/config/profile_jena +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Jena' - option 'homepage' 'http://www.freifunk-jena.de' - option 'ssid' 'www.freifunk-jena.de' - option 'mesh_network' '10.127.0.0/20' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '29' - option 'latitude' '50.92779' - option 'longitude' '11.58431' - -config 'defaults' 'interface' - option 'dns' '217.11.48.200 217.11.49.200 8.8.8.8' diff --git a/modules/freifunk/root/etc/config/profile_kiberpipa b/modules/freifunk/root/etc/config/profile_kiberpipa deleted file mode 100644 index c2a96e47c..000000000 --- a/modules/freifunk/root/etc/config/profile_kiberpipa +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Kiberpipa.net' - option 'homepage' 'http://www.kiberpipa.net' - option 'ssid' 'open.kiberpipa.net' - option 'mesh_network' '10.14.0.0/16' - option 'splash_network' '10.14.128.0/17' - option 'splash_prefix' '27' - option 'latitude' '46.05063' - option 'longitude' '14.50402' - -config 'defaults' 'wifi_device' - option 'channel' '8' - -config 'defaults' 'interface' - option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222' diff --git a/modules/freifunk/root/etc/config/profile_l59 b/modules/freifunk/root/etc/config/profile_l59 deleted file mode 100644 index 6185f0257..000000000 --- a/modules/freifunk/root/etc/config/profile_l59 +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk L59' - option 'homepage' 'http://freifunk.net' - option 'ssid' 'start.freifunk.net' - option 'mesh_network' '104.59.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '52.26337' - option 'longitude' '10.52103' - -config 'defaults' 'bssidscheme' - option '1' '02:CA:FF:EE:BA:BE' diff --git a/modules/freifunk/root/etc/config/profile_leipzig b/modules/freifunk/root/etc/config/profile_leipzig deleted file mode 100644 index 17f3cad41..000000000 --- a/modules/freifunk/root/etc/config/profile_leipzig +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Leipzig' - option 'homepage' 'http://leipzig.freifunk.net' - option 'ssid' 'leipzig.freifunk.net' - option 'mesh_network' '104.61.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.33348' - option 'longitude' '12.40297' - -config 'defaults' 'interface' - option 'netmask' '255.0.0.0' - -config 'defaults' 'bssidscheme' - option '1' '02:CA:FF:EE:BA:BE' diff --git a/modules/freifunk/root/etc/config/profile_mainz b/modules/freifunk/root/etc/config/profile_mainz deleted file mode 100644 index 2d086183e..000000000 --- a/modules/freifunk/root/etc/config/profile_mainz +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Mainz' - option 'homepage' 'http://mainz.freifunk.net' - option 'ssid' 'mainz.freifunk.net' - option 'mesh_network' '10.37.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '49.99635' - option 'longitude' '8.27417' - -config 'defaults' 'wifi_iface' - option 'bssid' '02:ca:ff:ee:ba:be' - -config 'defaults' 'wifi_device' - option 'channel' '1' diff --git a/modules/freifunk/root/etc/config/profile_marburg b/modules/freifunk/root/etc/config/profile_marburg deleted file mode 100644 index 18cff80e5..000000000 --- a/modules/freifunk/root/etc/config/profile_marburg +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Marburg' - option 'homepage' ' http://marburg.freifunk.de' - option 'ssid' 'marburg.freifunk.net' - option 'mesh_network' '10.128.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '29' - option 'latitude' '49.63939' - option 'longitude' '8.633718' - -config 'defaults' 'interface' - option 'dns' '8.8.8.8 212.204.49.83' diff --git a/modules/freifunk/root/etc/config/profile_neuss b/modules/freifunk/root/etc/config/profile_neuss deleted file mode 100644 index 8e3061730..000000000 --- a/modules/freifunk/root/etc/config/profile_neuss +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Neuss' - option 'homepage' 'http://neuss.freifunk.net' - option 'ssid' 'neuss.freifunk.net' - option 'mesh_network' '172.28.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.19045' - option 'longitude' '6.69471' - -config 'defaults' 'wifi_device' - option 'channel' '11' - -config 'defaults' 'wifi_iface' - option 'bssid' 'DE:AD:BE:EF:CA:FE' diff --git a/modules/freifunk/root/etc/config/profile_oldenburg b/modules/freifunk/root/etc/config/profile_oldenburg deleted file mode 100644 index e967fdb43..000000000 --- a/modules/freifunk/root/etc/config/profile_oldenburg +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Oldenburg' - option 'homepage' 'http://oldenburg.freifunk.net' - option 'ssid' 'oldenburg.freifunk.net' - option 'mesh_network' '10.18.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '53.14083' - option 'longitude' '8.21314' - -config 'defaults' 'wifi_device' - option 'channel' '6' - -config 'defaults' 'wifi_iface' - option 'bssid' '02:CA:FF:EE:BA:BE' diff --git a/modules/freifunk/root/etc/config/profile_openwireless_bern b/modules/freifunk/root/etc/config/profile_openwireless_bern deleted file mode 100644 index 810ad8f1c..000000000 --- a/modules/freifunk/root/etc/config/profile_openwireless_bern +++ /dev/null @@ -1,18 +0,0 @@ -config 'community' 'profile' - option 'name' 'Openwireless Bern' - option 'homepage' 'http://bern.openwireless.ch/' - option 'ssid' 'www.openwireless.ch' - option 'mesh_network' '10.247.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '50.814788' - option 'longitude' '8.769239' - -config 'defaults' 'interface' - option 'dns' '208.67.222.222 208.67.220.220' - -config 'defaults' 'wifi_device' - option 'channel' '10' - option 'country' '756' - - diff --git a/modules/freifunk/root/etc/config/profile_pberg b/modules/freifunk/root/etc/config/profile_pberg deleted file mode 100644 index ea2f7b081..000000000 --- a/modules/freifunk/root/etc/config/profile_pberg +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Berlin Prenzlauer Berg' - option 'homepage' 'http://pberg.freifunk.net' - option 'ssid' 'olsr.freifunk.net' - option 'mesh_network' '104.0.0.0/8' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '52.5427' - option 'longitude' '13.4172' - -config 'defaults' 'wifi_device' - option 'channel' '10' diff --git a/modules/freifunk/root/etc/config/profile_piraten_dresden b/modules/freifunk/root/etc/config/profile_piraten_dresden deleted file mode 100644 index 2af0e319d..000000000 --- a/modules/freifunk/root/etc/config/profile_piraten_dresden +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Piratenfreifunk Dresden' - option 'homepage' 'http://www.piraten-sachsen.de/' - option 'ssid' 'dresden.freifunk.net' - option 'mesh_network' '10.12.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.05081' - option 'longitude' '13.73420' - -config 'defaults' 'wifi_device' - option 'channel' '1' diff --git a/modules/freifunk/root/etc/config/profile_potsdam b/modules/freifunk/root/etc/config/profile_potsdam deleted file mode 100644 index a70a29ee5..000000000 --- a/modules/freifunk/root/etc/config/profile_potsdam +++ /dev/null @@ -1,12 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Potsdam' - option 'homepage' 'http://potsdam.freifunk.net' - option 'ssid' 'www.freifunk-potsdam.de' - option 'mesh_network' '10.22.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '52.39349' - option 'longitude' '13.06489' - -config 'defaults' 'wifi_device' - option 'channel' '13' diff --git a/modules/freifunk/root/etc/config/profile_rosbach b/modules/freifunk/root/etc/config/profile_rosbach deleted file mode 100644 index 4444f7099..000000000 --- a/modules/freifunk/root/etc/config/profile_rosbach +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Rosbach' - option 'homepage' 'freifunk-rosbach.de' - option 'ssid' 'rosbach.freifunk.net' - option 'mesh_network' '10.212.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '50.18' - option 'longitude' '8.42' - -config 'defaults' 'wifi_device' - option 'channel' '13' - -config 'defaults' 'wifi_iface' - option 'bssid' 'D2:CA:FF:EE:BA:BE' diff --git a/modules/freifunk/root/etc/config/profile_seefeld b/modules/freifunk/root/etc/config/profile_seefeld deleted file mode 100644 index 5d03f7d04..000000000 --- a/modules/freifunk/root/etc/config/profile_seefeld +++ /dev/null @@ -1,13 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Seefeld' - option 'homepage' 'http://wiki.freifunk.net/Seefeld.freifunk.net' - option 'ssid' 'seefeld.freifunk.net' - option 'mesh_network' '10.111.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '48.03485' - option 'longitude' '11.21279' - -config 'defaults' 'wifi_device' - option 'channel' '1' - option 'bssid' '02:CA:FF:EE:BA:BB' diff --git a/modules/freifunk/root/etc/config/profile_wlanljubljana b/modules/freifunk/root/etc/config/profile_wlanljubljana deleted file mode 100644 index eeefbd22b..000000000 --- a/modules/freifunk/root/etc/config/profile_wlanljubljana +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'wlan ljubljana' - option 'homepage' 'http://wlan-lj.net' - option 'ssid' 'open.wlan-lj.net' - option 'mesh_network' '10.254.0.0/16' - option 'splash_network' '10.254.120.0/21' - option 'splash_prefix' '27' - option 'latitude' '46.05063' - option 'longitude' '14.50402' - -config 'defaults' 'wifi_device' - option 'channel' '8' - -config 'defaults' 'interface' - option 'dns' '10.254.0.1 10.254.0.2' diff --git a/modules/freifunk/root/etc/init.d/freifunk b/modules/freifunk/root/etc/init.d/freifunk deleted file mode 100755 index 5ffec43e8..000000000 --- a/modules/freifunk/root/etc/init.d/freifunk +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh /etc/rc.common -# Freifunk Init -# $Id$ - -START=99 - -boot() { - test -f /etc/crontabs/root || touch /etc/crontabs/root - - grep -q 'killall -HUP dnsmasq' /etc/crontabs/root || { - echo "*/5 * * * * killall -HUP dnsmasq" >> /etc/crontabs/root - } - - grep -q '/usr/sbin/ff_olsr_watchdog' /etc/crontabs/root || { - echo "*/5 * * * * /usr/sbin/ff_olsr_watchdog" >> /etc/crontabs/root - } - - grep -q '/usr/sbin/ff_rdate' /etc/crontabs/root || { - echo "0 */4 * * * /usr/sbin/ff_rdate" >> /etc/crontabs/root - } - - [ -d /etc/rc.local.d ] && { - for file in /etc/rc.local.d/*; do - test -f "$file" && . "$file" - done - } - - ( sleep 40; /usr/sbin/ff_rdate; /etc/init.d/cron restart ) & -} diff --git a/modules/freifunk/root/etc/rc.local.d/01-config-migration b/modules/freifunk/root/etc/rc.local.d/01-config-migration deleted file mode 100644 index 11f1ad60b..000000000 --- a/modules/freifunk/root/etc/rc.local.d/01-config-migration +++ /dev/null @@ -1,51 +0,0 @@ -# Fixup various configurations to remove quirks -# from former versions. - -_log() { - logger -t "Config Migration" "$1" -} - -_uci() { - uci ${2:+-c $2} get "$1" 2>/dev/null -} - - -# Splash redirector had a wrong virtual url match -# which resulted in "No such handler" - -[ "$(_uci lucid.splashredir.virtual)" == "/" ] && { - _log "Fix splash redirector configuration" - uci set lucid.splashredir.virtual='' - uci commit lucid - /etc/init.d/lucid restart -} - - -# Newer OLSR versions have the MinTCVtime hack active, -# ensure proper timings or olsrd won't start - -FIX=0 -for i in 0 1 2 3 4; do - [ -z "$(_uci olsrd.@Interface[$i].TcInterval)" ] && \ - [ -z "$(_uci olsrd.@Interface[$i].TcValidityTime)" ] || { - uci delete olsrd.@Interface[$i].TcInterval - uci delete olsrd.@Interface[$i].TcValidityTime - FIX=1 - } -done - -[ "$FIX" == 1 ] && { - _log "Fix olsrd configuration for MinTCVTime hack" - uci commit olsrd - /etc/init.d/olsrd restart -} - - -# Ensure that the community definitions are in the -# new format - -[ -z "$(_uci freifunk.leipzig.mesh_network)" ] && \ -[ -n "$(_uci freifunk.leipzig.mesh_network /rom/etc/config)" ] && { - _log "Converting freifunk configuration to new format" - cp /rom/etc/config/freifunk /etc/config/freifunk -} 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 -- cgit v1.2.3