Reorganised Freifunk pages

Unified Community configuration

5 files changed, 28 insertions, 8 deletions

diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index af584cd83..096f5b7e5 100644
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -52,12 +52,14 @@ function index()
 		assign({"freifunk", "statistics"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40)
 	end
 	
-	local page  = node("admin", "index", "freifunk")
+	assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15)
+	entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), "Freifunk", 15)
+	local page  = node("admin", "freifunk", "index")
 	page.target = cbi("freifunk/freifunk")
 	page.title  = "Freifunk"
 	page.order  = 30
 	
-	local page  = node("admin", "index", "contact")
+	local page  = node("admin", "freifunk", "contact")
 	page.target = cbi("freifunk/contact")
 	page.title  = "Kontakt"
 	page.order  = 40
diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index 7678fc775..28a319169 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -83,31 +83,40 @@ config defaults olsr_interface
 
 
 config community leipzig
-	option name "Freifunk Leipzig (104.61)"
+	option name "Freifunk Leipzig"
 	option homepage http://leipzig.freifunk.net
 	option ssid "leipzig.freifunk.net"
 	option prefix "104.61"
 
 config community halle
-	option name "Freifunk Halle (104.62)"
+	option name "Freifunk Halle"
 	option homepage http://halle.freifunk.net
 	option ssid "halle.freifunk.net"
 	option prefix "104.62"
 
 config community l59
-	option name "Leisnig, Gadow, ... (104.59)"
+	option name "Freifunk L59"
 	option homepage http://freifunk.net
 	option ssid "start.freifunk.net"
 	option prefix "104.59"
 
 config community berlin
-	option name "Freifunk Berlin (104)"
+	option name "Freifunk Berlin"
 	option homepage http://berlin.freifunk.net
 	option ssid "olsr.freifunk.net"
 	option prefix "104"
+	option external freifunk_berlin
+	
+config community hannover
+	option name "Freifunk Hannover"
+	option homepage http://hannover.freifunk.net
+	option ssid "hannover.freifunk.net"
+	option prefix "10.2"
+	option external freifunk_hannover
 
 config community augsburg
-	option name "Freifunk Augsburg (191.161)"
+	option name "Freifunk Augsburg"
 	option homepage http://augsburg.freifunk.net
 	option ssid "augsburg.freifunk.net"
-	option prefix "191.161"
\ No newline at end of file
+	option prefix "191.161"
+	option external freifunk_augsburg
\ No newline at end of file
diff --git a/modules/freifunk/root/etc/config/freifunk_augsburg b/modules/freifunk/root/etc/config/freifunk_augsburg
new file mode 100644
index 000000000..f68600c26
--- /dev/null
+++ b/modules/freifunk/root/etc/config/freifunk_augsburg
@@ -0,0 +1,2 @@
+config defaults interface
+    option netmask  255.255.0.0
\ No newline at end of file
diff --git a/modules/freifunk/root/etc/config/freifunk_berlin b/modules/freifunk/root/etc/config/freifunk_berlin
new file mode 100644
index 000000000..65bde7666
--- /dev/null
+++ b/modules/freifunk/root/etc/config/freifunk_berlin
@@ -0,0 +1,2 @@
+config defaults wifi_device
+	option channel 10
\ No newline at end of file
diff --git a/modules/freifunk/root/etc/config/freifunk_hannover b/modules/freifunk/root/etc/config/freifunk_hannover
new file mode 100644
index 000000000..f797a938f
--- /dev/null
+++ b/modules/freifunk/root/etc/config/freifunk_hannover
@@ -0,0 +1,5 @@
+config defaults wifi_iface
+    option bssid    CA:FF:EE:CA:FF:EE
+    
+config defaults interface
+    option netmask  255.255.0.0
\ No newline at end of file