luci-0.9: merge r5330

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index c2ea2dd3f0e197ecef7c475794dcefb0a5e9a8c5..b7c737dbb1541567de36d3d0c0e453e257b7588b 100644 (file)
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -129,6 +129,15 @@ config community potsdam
        option splash_prefix "27"
        option external freifunk_potsdam
 
+config community hamburg
+       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 external freifunk_hamburg
+
 config community hannover
        option name "Freifunk Hannover"
        option homepage http://hannover.freifunk.net

diff --git a/modules/freifunk/root/etc/config/freifunk_hamburg b/modules/freifunk/root/etc/config/freifunk_hamburg
new file mode 100644 (file)
index 0000000..c3ca761
--- /dev/null
+++ b/modules/freifunk/root/etc/config/freifunk_hamburg
@@ -0,0 +1,5 @@
+config defaults interface
+       option netmask  255.240.0.0
+
+config defaults wifi_device
+       option channel 1