From 25c3869fc34c5b38a39f99daf28af04f9b73a36f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 29 Nov 2009 15:17:29 +0000 Subject: [PATCH] luci-0.9: merge r5599 --- modules/freifunk/root/etc/config/freifunk | 15 ++++++++++++--- .../{freifunk_ljubljana => freifunk_kiberpipa} | 2 +- .../root/etc/config/freifunk_wlanljubljana | 8 ++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) rename modules/freifunk/root/etc/config/{freifunk_ljubljana => freifunk_kiberpipa} (85%) create mode 100644 modules/freifunk/root/etc/config/freifunk_wlanljubljana diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk index d99cfeb04..0e9785840 100644 --- a/modules/freifunk/root/etc/config/freifunk +++ b/modules/freifunk/root/etc/config/freifunk @@ -194,12 +194,21 @@ config 'community' 'duesseldorf' option 'splash_prefix' '27' option 'external' 'freifunk_duesseldorf' -config 'community' 'ljubljana' - option 'name' 'Kiberpipa.net (wlan-lj)' +config 'community' 'kiberpipa' + option 'name' 'Kiberpipa.net' option 'homepage' 'http://www.kiberpipa.net' option 'ssid' 'open.kiberpipa.net' option 'mesh_network' '10.14.0.0/16' option 'splash_network' '10.14.128.0/17' option 'splash_prefix' '27' - option 'external' 'freifunk_ljubljana' + option 'external' 'freifunk_kiberpipa' + +config 'community' 'wlanljubljana' + option 'name' 'wlan ljubljana' + option 'homepage' 'http://wlan-lj.net' + option 'ssid' 'open.wlan-lj.net' + option 'mesh_network' '10.254.0.0/16' + option 'splash_network' '10.254.120.0/21' + option 'splash_prefix' '27' + option 'external' 'freifunk_wlanljubljana' diff --git a/modules/freifunk/root/etc/config/freifunk_ljubljana b/modules/freifunk/root/etc/config/freifunk_kiberpipa similarity index 85% rename from modules/freifunk/root/etc/config/freifunk_ljubljana rename to modules/freifunk/root/etc/config/freifunk_kiberpipa index 753d43480..669929133 100644 --- a/modules/freifunk/root/etc/config/freifunk_ljubljana +++ b/modules/freifunk/root/etc/config/freifunk_kiberpipa @@ -1,4 +1,4 @@ -package 'freifunk_ljubljana' +package 'freifunk_kiberpipa' config 'defaults' 'wifi_device' option 'channel' '8' diff --git a/modules/freifunk/root/etc/config/freifunk_wlanljubljana b/modules/freifunk/root/etc/config/freifunk_wlanljubljana new file mode 100644 index 000000000..3a4e300db --- /dev/null +++ b/modules/freifunk/root/etc/config/freifunk_wlanljubljana @@ -0,0 +1,8 @@ +package 'freifunk_wlanljubljana' + +config 'defaults' 'wifi_device' + option 'channel' '8' + +config 'defaults' 'interface' + option 'dns' '10.254.0.1 10.254.0.2' + option 'netmask' '255.255.0.0' -- 2.25.1