From 3725e579cadffbda265415624004d2377ed6509f Mon Sep 17 00:00:00 2001 From: Nico Geyso Date: Tue, 16 Sep 2014 12:49:58 +0200 Subject: [PATCH] community-profiles: update berlin profile & remove berlin_pberg these patches are used by the berlin-freifunk-community since 2014 - change ssid (https://github.com/freifunk-berlin/firmware/commit/563c955a19ea0db0bcbe6da1be0f50dd971961a3) - remove obsolete olsr defaults (https://github.com/freifunk-berlin/firmware/commit/4558f8c88a99807388b3b1e315b440693b778a1d) - use intern-chXX.freifunk.net as ssid scheme for adhoc (https://github.com/freifunk-berlin/firmware/commit/6ce8f590822bd31c37f247a8f006a8f2c5567b55) - add mcast_rate (https://github.com/freifunk-berlin/firmware/commit/e90753ed0485d9c59a3af55efc8156e391ca848a) (https://github.com/freifunk-berlin/firmware/commit/01856773720b4755ee83080ba400b8489cf97416) - add wifi_device and *_iface for 5GHz (https://github.com/freifunk-berlin/firmware/commit/5823e89a3d2d13bb47a2c9c7d33541588b9e64ab) - remove owm_api and mapserver key from community profile (https://github.com/freifunk-berlin/firmware/commit/d4ee2e1bce4f04882af8cf28e62b97795959c31f) - add two ipv6 nameservers (https://github.com/freifunk-berlin/firmware/commit/83df6ab77164a391f4536e32bc549a577d06af89) - change default dhcp leasetime to 5 minutes (https://github.com/freifunk-berlin/firmware/commit/b38af129e0d4d4f5b6d1b1c23c57e6bec312de5f) - remove non existent freifunk community profiles (Berlin) (https://github.com/freifunk-berlin/firmware/commit/6c49443bdef9905e71ad77b729d4cc95c5d66062) Signed-off-by: Sven Roederer --- .../files/etc/config/profile_berlin | 46 ++++++++-------------- .../files/etc/config/profile_pberg | 38 ------------------ 2 files changed, 17 insertions(+), 67 deletions(-) delete mode 100644 contrib/package/community-profiles/files/etc/config/profile_pberg diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index b4694c000..7fff870d4 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_berlin +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -1,50 +1,38 @@ config 'community' 'profile' option 'name' 'Freifunk Berlin' option 'homepage' 'http://berlin.freifunk.net' - option 'ssid' 'freifunk.net' + option 'ssid' 'berlin.freifunk.net' option 'ssid_scheme' 'addchannelbefore' 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' - list 'owm_api' 'http://api.openwifimap.net' - list 'owm_api' 'http://owmapi.pberg.freifunk.net' - option 'mapserver' 'http://map.pberg.freifunk.net/' config 'defaults' 'wifi_device' option 'channel' '13' +config 'defaults' 'wifi_device_5' + option 'channel' '36' + +config 'defaults' 'wifi_iface' + option 'mcast_rate' '6000' + +config 'defaults' 'wifi_iface_5' + option 'mcast_rate' '12000' + config 'defaults' 'bssidscheme' option '10' '02:CA:FF:EE:BA:BE' option '13' 'D2:CA:FF:EE:BA:BE' option '36' '02:36:CA:FF:EE:EE' config 'defaults' 'ssidscheme' - option '13' 'ch13.freifunk.net' - option '36' 'ch36.freifunk.net' + option '13' 'intern-ch13.freifunk.net' + option '36' 'intern-ch36.freifunk.net' config 'defaults' 'interface' - option 'netmask' '255.0.0.0' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168' - -config 'defaults' 'olsr_interface' - option 'Ip4Broadcast' '255.255.255.255' - option 'HelloInterval' '3.0' - option 'HelloValidityTime' '125.0' - option 'TcInterval' '2.0' - option 'TcValidityTime' '500.0' - option 'MidInterval' '25.0' - option 'MidValidityTime' '500.0' - option 'HnaInterval' '10.0' - option 'HnaValidityTime' '125.0' - -config 'defaults' 'olsrd' - option 'AllowNoInt' 'yes' - option 'FIBMetric' 'flat' - option 'Pollrate' '0.025' - option 'TcRedundancy' '2' - option 'NatThreshold' '0.75' - option 'LinkQualityAlgorithm' 'etx_ff' - option 'RtTableDefaultOlsrPriority' '20000' - option 'RtTableTunnelPriority' '100000' + option 'netmask' '255.255.255.255' + option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168 2001:4ce8::53 2001:910:800::12' + +config 'dhcp' 'dhcp' + option leasetime '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_pberg b/contrib/package/community-profiles/files/etc/config/profile_pberg deleted file mode 100644 index 1122eaa31..000000000 --- a/contrib/package/community-profiles/files/etc/config/profile_pberg +++ /dev/null @@ -1,38 +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' - list 'owm_api' 'http://api.openwifimap.net' - list 'owm_api' 'http://owmapi.pberg.freifunk.net' - option 'mapserver' 'http://map.pberg.freifunk.net/' - -config 'defaults' 'wifi_device' - option 'channel' '10' - -config 'defaults' 'interface' - option 'netmask' '255.0.0.0' - -config 'defaults' 'olsr_interface' - option 'Ip4Broadcast' '255.255.255.255' - option 'HelloInterval' '3.0' - option 'HelloValidityTime' '125.0' - option 'TcInterval' '2.0' - option 'TcValidityTime' '500.0' - option 'MidInterval' '25.0' - option 'MidValidityTime' '500.0' - option 'HnaInterval' '10.0' - option 'HnaValidityTime' '125.0' - -config 'defaults' 'olsrd' - option 'AllowNoInt' 'yes' - option 'FIBMetric' 'flat' - option 'Pollrate' '0.025' - option 'TcRedundancy' '2' - option 'NatThreshold' '0.75' - option 'LinkQualityAlgorithm' 'etx_ff' - -- 2.11.0