luci-0.9: merge r5019 and r5020

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index 7a2e9ef089f54608dab4a28e2ad3c65e9155d700..bc70901b32ab517b19381135b69b77754bad62f0 100644 (file)
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -111,6 +111,13 @@ config community berlin
        option prefix "104"
        option external freifunk_berlin
 
+config community potsdam
+       option name "Freifunk Potsdam"
+       option homepage http://potsdam.freifunk.net
+       option ssid "www.freifunk-potsdam.de"
+       option prefix "10.22"
+       option external freifunk_potsdam
+
 config community hannover
        option name "Freifunk Hannover"
        option homepage http://hannover.freifunk.net
@@ -124,3 +131,10 @@ config community augsburg
        option ssid "augsburg.freifunk.net"
        option prefix "191.161"
        option external freifunk_augsburg
+
+config 'community' 'jena'
+       option 'name' 'Freifunk Jena'
+       option 'homepage' 'http://www.freifunk-jena.de'
+       option 'ssid' 'jena.freifunk.net'
+       option 'prefix' '10.127'
+#      option 'external' 'freifunk_jena'

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