From: Manuel Munz Date: Wed, 23 Feb 2011 23:17:10 +0000 (+0000) Subject: luci-0.10: Merge r6925 X-Git-Tag: 0.10.0~171 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=88fca987941effabd826e5e35ab6e0aa7a098e28;p=oweals%2Fluci.git luci-0.10: Merge r6925 --- diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk index b0009703f..9aa3f27c3 100644 --- a/modules/freifunk/root/etc/config/freifunk +++ b/modules/freifunk/root/etc/config/freifunk @@ -70,8 +70,8 @@ config 'defaults' 'wifi_iface' option 'sw_merge' '1' config 'defaults' 'interface' - option 'netmask' '255.0.0.0' - option 'dns' '88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222' + option 'netmask' '255.255.0.0' + option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1' config 'defaults' 'alias' option 'netmask' '255.255.255.0' diff --git a/modules/freifunk/root/etc/config/profile_aachen b/modules/freifunk/root/etc/config/profile_aachen index 99baa9e2f..f78d9f95a 100644 --- a/modules/freifunk/root/etc/config/profile_aachen +++ b/modules/freifunk/root/etc/config/profile_aachen @@ -7,6 +7,3 @@ config 'community' 'profile' option 'mesh_network' '10.90.0.0/16' option 'splash_network' '10.104.0.0/16' option 'splash_prefix' '28' - -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' diff --git a/modules/freifunk/root/etc/config/profile_bergischesland b/modules/freifunk/root/etc/config/profile_bergischesland index 46ad71ceb..0de454303 100644 --- a/modules/freifunk/root/etc/config/profile_bergischesland +++ b/modules/freifunk/root/etc/config/profile_bergischesland @@ -13,7 +13,3 @@ config 'defaults' 'wifi_device' config 'defaults' 'wifi_iface' option 'bssid' '02:40:00:42:42:42' - -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - diff --git a/modules/freifunk/root/etc/config/profile_berlin b/modules/freifunk/root/etc/config/profile_berlin index a37a6cb23..c41144e48 100644 --- a/modules/freifunk/root/etc/config/profile_berlin +++ b/modules/freifunk/root/etc/config/profile_berlin @@ -10,3 +10,7 @@ config 'community' 'profile' config 'defaults' 'wifi_device' option 'channel' '10' + +config 'defaults' 'interface' + option 'netmask' '255.0.0.0' + diff --git a/modules/freifunk/root/etc/config/profile_duesseldorf b/modules/freifunk/root/etc/config/profile_duesseldorf index 64ebbac81..73273957c 100644 --- a/modules/freifunk/root/etc/config/profile_duesseldorf +++ b/modules/freifunk/root/etc/config/profile_duesseldorf @@ -8,9 +8,6 @@ config 'community' 'profile' option 'latitude' '51.22347' option 'longitude' '6.78449' -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - config 'defaults' 'wifi_device' option 'channel' '3' diff --git a/modules/freifunk/root/etc/config/profile_hannover b/modules/freifunk/root/etc/config/profile_hannover index 99f2c46f1..008b6c70e 100644 --- a/modules/freifunk/root/etc/config/profile_hannover +++ b/modules/freifunk/root/etc/config/profile_hannover @@ -10,7 +10,3 @@ config 'community' 'profile' config 'defaults' 'wifi_iface' option 'bssid' 'CA:FF:EE:CA:FF:EE' - -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - diff --git a/modules/freifunk/root/etc/config/profile_kiberpipa b/modules/freifunk/root/etc/config/profile_kiberpipa index 628850a9f..c2a96e47c 100644 --- a/modules/freifunk/root/etc/config/profile_kiberpipa +++ b/modules/freifunk/root/etc/config/profile_kiberpipa @@ -13,4 +13,3 @@ config 'defaults' 'wifi_device' config 'defaults' 'interface' option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222' - option 'netmask' '255.255.0.0' diff --git a/modules/freifunk/root/etc/config/profile_leipzig b/modules/freifunk/root/etc/config/profile_leipzig index 1418f7aae..f4dffb80c 100644 --- a/modules/freifunk/root/etc/config/profile_leipzig +++ b/modules/freifunk/root/etc/config/profile_leipzig @@ -8,5 +8,7 @@ config 'community' 'profile' option 'latitude' '51.33348' option 'longitude' '12.40297' +config 'defaults' 'interface' + option 'netmask' '255.0.0.0' diff --git a/modules/freifunk/root/etc/config/profile_mainz b/modules/freifunk/root/etc/config/profile_mainz index c6cd61df1..2d086183e 100644 --- a/modules/freifunk/root/etc/config/profile_mainz +++ b/modules/freifunk/root/etc/config/profile_mainz @@ -13,7 +13,3 @@ config 'defaults' 'wifi_iface' config 'defaults' 'wifi_device' option 'channel' '1' - -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - diff --git a/modules/freifunk/root/etc/config/profile_marburg b/modules/freifunk/root/etc/config/profile_marburg index 21ad644e2..18cff80e5 100644 --- a/modules/freifunk/root/etc/config/profile_marburg +++ b/modules/freifunk/root/etc/config/profile_marburg @@ -10,4 +10,3 @@ config 'community' 'profile' config 'defaults' 'interface' option 'dns' '8.8.8.8 212.204.49.83' - option 'netmask' '255.255.0.0' diff --git a/modules/freifunk/root/etc/config/profile_neuss b/modules/freifunk/root/etc/config/profile_neuss index 5f97d879a..8e3061730 100644 --- a/modules/freifunk/root/etc/config/profile_neuss +++ b/modules/freifunk/root/etc/config/profile_neuss @@ -11,8 +11,5 @@ config 'community' 'profile' config 'defaults' 'wifi_device' option 'channel' '11' -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - config 'defaults' 'wifi_iface' option 'bssid' 'DE:AD:BE:EF:CA:FE' diff --git a/modules/freifunk/root/etc/config/profile_openwireless_bern b/modules/freifunk/root/etc/config/profile_openwireless_bern index b9f5cbd76..810ad8f1c 100644 --- a/modules/freifunk/root/etc/config/profile_openwireless_bern +++ b/modules/freifunk/root/etc/config/profile_openwireless_bern @@ -9,7 +9,6 @@ config 'community' 'profile' option 'longitude' '8.769239' config 'defaults' 'interface' - option 'netmask' '255.255.0.0' option 'dns' '208.67.222.222 208.67.220.220' config 'defaults' 'wifi_device' diff --git a/modules/freifunk/root/etc/config/profile_potsdam b/modules/freifunk/root/etc/config/profile_potsdam index ff1d661ab..a70a29ee5 100644 --- a/modules/freifunk/root/etc/config/profile_potsdam +++ b/modules/freifunk/root/etc/config/profile_potsdam @@ -8,8 +8,5 @@ config 'community' 'profile' option 'latitude' '52.39349' option 'longitude' '13.06489' -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' - config 'defaults' 'wifi_device' option 'channel' '13' diff --git a/modules/freifunk/root/etc/config/profile_rosbach b/modules/freifunk/root/etc/config/profile_rosbach index ec072811a..4444f7099 100644 --- a/modules/freifunk/root/etc/config/profile_rosbach +++ b/modules/freifunk/root/etc/config/profile_rosbach @@ -13,6 +13,3 @@ config 'defaults' 'wifi_device' config 'defaults' 'wifi_iface' option 'bssid' 'D2:CA:FF:EE:BA:BE' - -config 'defaults' 'interface' - option 'netmask' '255.255.0.0' diff --git a/modules/freifunk/root/etc/config/profile_seefeld b/modules/freifunk/root/etc/config/profile_seefeld index f88562d6f..5d03f7d04 100644 --- a/modules/freifunk/root/etc/config/profile_seefeld +++ b/modules/freifunk/root/etc/config/profile_seefeld @@ -8,9 +8,6 @@ config 'community' 'profile' option 'latitude' '48.03485' option 'longitude' '11.21279' -config 'defaults' 'interface' - option 'netmask' '255.255.255.0' - config 'defaults' 'wifi_device' option 'channel' '1' option 'bssid' '02:CA:FF:EE:BA:BB' diff --git a/modules/freifunk/root/etc/config/profile_wlanljubljana b/modules/freifunk/root/etc/config/profile_wlanljubljana index 9d76eeb67..eeefbd22b 100644 --- a/modules/freifunk/root/etc/config/profile_wlanljubljana +++ b/modules/freifunk/root/etc/config/profile_wlanljubljana @@ -13,4 +13,3 @@ config 'defaults' 'wifi_device' config 'defaults' 'interface' option 'dns' '10.254.0.1 10.254.0.2' - option 'netmask' '255.255.0.0'