diff options
Diffstat (limited to 'contrib')
5 files changed, 84 insertions, 92 deletions
diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index b4694c0001..7fff870d41 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_cottbus b/contrib/package/community-profiles/files/etc/config/profile_cottbus index 143c505c0b..6f395a1332 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_cottbus +++ b/contrib/package/community-profiles/files/etc/config/profile_cottbus @@ -7,11 +7,11 @@ config 'community' 'profile' option 'splash_network' '10.104.0.0/16' option 'splash_prefix' '27' option 'latitude' '51.757689' - option 'longitude' '13.40948' - + option 'longitude' '13.40948' + config 'defaults' 'wifi_device' option 'channel' '13' - + config 'defaults' 'wifi_device_5' option 'channel' '36' @@ -24,14 +24,14 @@ config 'defaults' 'wifi_iface_5' config 'defaults' 'bssidscheme' option '13' 'D2:CA:FF:EE:BA:BE' option '36' '02:36:CA:FF:EE:EE' - + config 'defaults' 'ssidscheme' option '13' 'intern-ch13.cottbus.freifunk.net' option '36' 'intern-ch36.cottbus.freifunk.net' - + config 'defaults' 'interface' 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_halle b/contrib/package/community-profiles/files/etc/config/profile_halle index 0e8e43fdab..30d0e8fa4f 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_halle +++ b/contrib/package/community-profiles/files/etc/config/profile_halle @@ -1,12 +1,16 @@ config 'community' 'profile' option 'name' 'Freifunk Halle' - option 'homepage' 'http://freifunk-halle.net' + option 'homepage' 'http://freifunk-halle.org' option 'ssid' 'halle.freifunk.net' - option 'mesh_network' '104.62.0.0/16' - option 'splash_network' '10.104.0.0/16' + option 'mesh_network' '10.62.0.0/16' + option 'splash_network' '6.0.0.0/8' option 'splash_prefix' '27' option 'latitude' '51.47911' option 'longitude' '11.96901' + option 'adhoc_dhcp_when_vap' '0' + option 'suffix' 'ffhal' + option 'vap' '1' + option 'batman' '1' config 'defaults' 'wifi_device' option 'channel' '13' @@ -15,8 +19,17 @@ config 'defaults' 'wifi_device' config 'defaults' 'bssidscheme' option 'all' '02:CA:FF:EE:BA:BE' +config 'defaults' 'luci_splash' + option 'redirect_url' 'http://freifunk-halle.org/willkommen.php' + config 'defaults' 'interface' - option 'netmask' '255.0.0.0' + option 'netmask' '255.255.255.255' + +config 'defaults' 'wifi_iface' + option 'mcast_rate' '6000' + +config 'defaults' 'dhcp' + option 'leasetime' '5m' config 'defaults' 'olsrd' option 'AllowNoInt' 'yes' @@ -38,3 +51,21 @@ config 'defaults' 'olsr_interface' option 'MidValidityTime' '375.0' option 'HnaInterval' '25.0' option 'HnaValidityTime' '375.0' + +config widget 'rsshalle' + option cache '3600' + option width '50%' + option title 'neuste Foreneinträge in Halle' + option template 'rssfeed' + option enabled '1' + option max '5' + option url 'http://www.freifunk-halle.org/rss.php' + +config widget 'rssbundesweit' + option cache '3600' + option width '50%' + option title 'bundesweiter Freifunk Blog' + option template 'rssfeed' + option enabled '1' + option max '10' + option url 'http://blog.freifunk.net/rss.xml' 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 1122eaa315..0000000000 --- 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' - diff --git a/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting b/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting index 05a75407d8..4c9172427c 100755 --- a/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting +++ b/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting @@ -51,22 +51,33 @@ rt_tables() { } -disable_dyngw() { - for cfg in $cfgs; do - local dyngwlib=`uci show $cfg |grep dyn_gw.so |awk {' FS="."; print $1"."$2 '}` - if [ -n "$dyngwlib" ]; then - uci set $dyngwlib.ignore=1 - uci commit $cfg - fi - - dyngwplainlib=`uci show $cfg |grep dyn_gw_plain |awk {' FS="."; print $1"."$2 '}` - if [ -n "$dyngwplainlib" ]; then - rttable="$(uci -q get $dyngwplainlib.RtTable)" - if [ -z "$rttable" ] || [ "$rttable" = "254" ]; then - uci set $dyngwplainlib.ignore=1 - uci commit $cfg +handle_disable_dyngw() { + local cfg="$1" + local olsrd_cfg="$2" + config_get library "$cfg" library + case "$library" in + olsrd_dyn_gw_plain*) + config_get RtTable "$cfg" RtTable + if [ -z "$RtTable" ] || [ "$RtTable" = "254" ]; then + config_set "$cfg" ignore '1' + uci set $olsrd_cfg.$cfg.ignore="1" + uci commit $olsrd_cfg + logger -s -t policyrouting -p info "dyngw_plain plugin disabled." fi - fi + ;; + olsrd_dyn_gw.so*) + logger -s -t policyrouting -p info "$cfg" + uci set $olsrd_cfg.$cfg.ignore="1" + uci commit $olsrd_cfg + logger -s -t policyrouting -p info "dyngw plugin disabled." + ;; + esac +} + +disable_dyngw() { + for olsrd_cfg in $cfgs; do + config_load $olsrd_cfg + config_foreach handle_disable_dyngw LoadPlugin $olsrd_cfg done } |