luci-0.10: Merge r6860

diff --git a/modules/freifunk/root/etc/config/profile_-custom b/modules/freifunk/root/etc/config/profile_-custom
index 3b06444ae95b524b9f82b8eaa7c5e57240fdb77f..6335be48fa2719ad96a256a3e5e5ea533a224c75 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_-custom
+++ b/modules/freifunk/root/etc/config/profile_-custom
@@ -5,7 +5,6 @@ config 'community'      'profile'
        option 'splash_network' '10.104.0.0/16'
        option 'latitude' '52.000'
        option 'longitude' '10.000'
-       option 'external' 'freifunk_custom'
        option 'splash_prefix' '28'
        option 'mesh_network' '1.0.0.0/16'
 

diff --git a/modules/freifunk/root/etc/config/profile_bayreuth b/modules/freifunk/root/etc/config/profile_bayreuth
new file mode 100644 (file)
index 0000000..1d03d14
--- /dev/null
+++ b/modules/freifunk/root/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' 'ffa'
+        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_bergischesland b/modules/freifunk/root/etc/config/profile_bergischesland
index b32eea9a725493ab06f9220e0e834f3e73ac7470..46ad71ceb2b1524e9c5cf79734a1d7ba2ad15c77 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_bergischesland
+++ b/modules/freifunk/root/etc/config/profile_bergischesland
@@ -7,7 +7,6 @@ config 'community'      'profile'
        option 'splash_prefix' '27'
        option 'latitude' '51.26849'
        option 'longitude' '7.19476'
-       option 'external' 'freifunk_bergischesland'
 
 config 'defaults' 'wifi_device'
        option 'channel' '11'