modules/freifunk: add profiles for Seefeld and Duesseldorf, reformat uci

11 files changed, 250 insertions, 185 deletions

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index 2f0a13745..d99cfeb04 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -1,168 +1,170 @@
-config settings wizard
-config public contact
-	option nickname ''
-	option name ''
-	option mail ''
-	option phone ''
-	option location ''
-	option note ''
-
-config public community
-	option name 'Freifunk'
-	option homepage 'http://freifunk.net'
-
-config fw_rule icmp
-	option src freifunk
-	option target ACCEPT
-	option proto  icmp
-
-config fw_rule http
-	option src freifunk
-	option target ACCEPT
-	option proto  tcp
-	option dest_port 80
-
-config fw_rule https
-	option src freifunk
-	option target ACCEPT
-	option proto  tcp
-	option dest_port 443
-
-config fw_rule ssh
-	option src freifunk
-	option target ACCEPT
-	option proto  tcp
-	option dest_port 22
-
-config fw_rule olsr
-	option src freifunk
-	option target ACCEPT
-	option proto  udp
-	option dest_port 698
-
-config fw_rule wprobe
-	option src freifunk
-	option target ACCEPT
-	option proto  tcp
-	option dest_port 17990
-
-config fw_forwarding lan
-	option src lan
-	option dest freifunk
-
-config fw_forwarding fffwd
-	option src freifunk
-	option dest freifunk
-
-
-config defaults wifi_device
-    option channel   1
-    option diversity 1
-    option disabled  0
-    option txpower   15
-    option country   276
-
-config defaults wifi_iface
-    option mode		adhoc
-    option bssid    02:CA:FF:EE:BA:BE
-    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"
-
-config defaults alias
-	option netmask	255.255.255.0
-
-config defaults dhcp
-	option leasetime 30m
-
-config defaults olsr_interface
-	option Ip4Broadcast 255.255.255.255
-
-config defaults time
-	option rdate_servers "128.138.140.44 171.64.7.77 171.64.7.99 81.169.154.44 130.133.1.10"
-
-config defaults upgrade
-	option repository "http://dev.luci.freifunk-halle.net/freifunk-snapshots"
-	option rssfeed "http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml"
-
-config community leipzig
-	option name "Freifunk Leipzig"
-	option homepage http://leipzig.freifunk.net
-	option ssid "leipzig.freifunk.net"
-	option mesh_network "104.61.0.0/16"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "27"
-
-config community halle
-	option name "Freifunk Halle"
-	option homepage http://halle.freifunk.net
-	option ssid "halle.freifunk.net"
-	option mesh_network "104.62.0.0/16"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "27"
-
-config community l59
-	option name "Freifunk L59"
-	option homepage http://freifunk.net
-	option ssid "start.freifunk.net"
-	option mesh_network "104.59.0.0/16"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "27"
-
-config community berlin
-	option name "Freifunk Berlin"
-	option homepage http://berlin.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 external freifunk_berlin
-
-config community potsdam
-	option name "Freifunk Potsdam"
-	option homepage http://potsdam.freifunk.net
-	option ssid "www.freifunk-potsdam.de"
-	option mesh_network "10.22.0.0/16"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "27"
-	option external freifunk_potsdam
-
-config community hamburg
-	option name "Freifunk Hamburg"
-	option homepage http://hamburg.piratenpartei.de
-	option ssid "hamburg.freifunk.net"
-	option mesh_network "10.112.0.0/12"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "27"
-	option external freifunk_hamburg
-
-config community hannover
-	option name "Freifunk Hannover"
-	option homepage http://hannover.freifunk.net
-	option ssid "hannover.freifunk.net"
-	option mesh_network "10.2.0.0/16"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "27"
-	option external freifunk_hannover
-
-config community augsburg
-	option name "Freifunk Augsburg"
-	option homepage http://augsburg.freifunk.net
-	option ssid "augsburg.freifunk.net"
-	option mesh_network "10.11.0.0/18"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "27"
-	option external freifunk_augsburg
+package 'freifunk'
+
+config 'settings' 'wizard'
+
+config 'public' 'contact'
+	option 'nickname' ''
+	option 'name' ''
+	option 'mail' ''
+	option 'phone' ''
+	option 'location' ''
+	option 'note' ''
+
+config 'public' 'community'
+	option 'name' 'Freifunk'
+	option 'homepage' 'http://freifunk.net'
+
+config 'fw_rule' 'icmp'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'icmp'
+
+config 'fw_rule' 'http'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '80'
+
+config 'fw_rule' 'https'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '443'
+
+config 'fw_rule' 'ssh'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '22'
+
+config 'fw_rule' 'olsr'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'udp'
+	option 'dest_port' '698'
+
+config 'fw_rule' 'wprobe'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+	option 'dest_port' '17990'
+
+config 'fw_forwarding' 'lan'
+	option 'src' 'lan'
+	option 'dest' 'freifunk'
+
+config 'fw_forwarding' 'fffwd'
+	option 'src' 'freifunk'
+	option 'dest' 'freifunk'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '1'
+	option 'diversity' '1'
+	option 'disabled' '0'
+	option 'txpower' '15'
+	option 'country' '276'
+
+config 'defaults' 'wifi_iface'
+	option 'mode' 'adhoc'
+	option 'bssid' '02:CA:FF:EE:BA:BE'
+	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'
+
+config 'defaults' 'alias'
+	option 'netmask' '255.255.255.0'
+
+config 'defaults' 'dhcp'
+	option 'leasetime' '30m'
+
+config 'defaults' 'olsr_interface'
+	option 'Ip4Broadcast' '255.255.255.255'
+
+config 'defaults' 'time'
+	option 'rdate_servers' '128.138.140.44 171.64.7.77 171.64.7.99 81.169.154.44 130.133.1.10'
+
+config 'defaults' 'upgrade'
+	option 'repository' 'http://dev.luci.freifunk-halle.net/freifunk-snapshots'
+	option 'rssfeed' 'http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml'
+
+config 'community' 'leipzig'
+	option 'name' 'Freifunk Leipzig'
+	option 'homepage' 'http://leipzig.freifunk.net'
+	option 'ssid' 'leipzig.freifunk.net'
+	option 'mesh_network' '104.61.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+
+config 'community' 'halle'
+	option 'name' 'Freifunk Halle'
+	option 'homepage' 'http://halle.freifunk.net'
+	option 'ssid' 'halle.freifunk.net'
+	option 'mesh_network' '104.62.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+
+config 'community' 'l59'
+	option 'name' 'Freifunk L59'
+	option 'homepage' 'http://freifunk.net'
+	option 'ssid' 'start.freifunk.net'
+	option 'mesh_network' '104.59.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+
+config 'community' 'berlin'
+	option 'name' 'Freifunk Berlin'
+	option 'homepage' 'http://berlin.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 'external' 'freifunk_berlin'
+
+config 'community' 'potsdam'
+	option 'name' 'Freifunk Potsdam'
+	option 'homepage' 'http://potsdam.freifunk.net'
+	option 'ssid' 'www.freifunk-potsdam.de'
+	option 'mesh_network' '10.22.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'external' 'freifunk_potsdam'
+
+config 'community' 'hamburg'
+	option 'name' 'Freifunk Hamburg'
+	option 'homepage' 'http://hamburg.piratenpartei.de'
+	option 'ssid' 'hamburg.freifunk.net'
+	option 'mesh_network' '10.112.0.0/12'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'external' 'freifunk_hamburg'
+
+config 'community' 'hannover'
+	option 'name' 'Freifunk Hannover'
+	option 'homepage' 'http://hannover.freifunk.net'
+	option 'ssid' 'hannover.freifunk.net'
+	option 'mesh_network' '10.2.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'external' 'freifunk_hannover'
+
+config 'community' 'augsburg'
+	option 'name' 'Freifunk Augsburg'
+	option 'homepage' 'http://augsburg.freifunk.net'
+	option 'ssid' 'augsburg.freifunk.net'
+	option 'mesh_network' '10.11.0.0/18'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'external' 'freifunk_augsburg'
 
 config 'community' 'jena'
 	option 'name' 'Freifunk Jena'
 	option 'homepage' 'http://www.freifunk-jena.de'
 	option 'ssid' 'jena.freifunk.net'
-	option mesh_network "10.127.0.0/20"
-	option splash_network "10.104.0.0/16"
-	option splash_prefix "29"
+	option 'mesh_network' '10.127.0.0/20'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '29'
 	option 'external' 'freifunk_jena'
 
 config 'community' 'mainz'
@@ -174,6 +176,24 @@ config 'community' 'mainz'
 	option 'splash_prefix' '27'
 	option 'external' 'freifunk_mainz'
 
+config 'community' 'seefeld'
+	option 'name' 'Freifunk Seefeld'
+	option 'homepage' 'http://wiki.freifunk.net/Seefeld.freifunk.net'
+	option 'ssid' 'seefeld.freifunk.net'
+	option 'mesh_network' '10.111.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'external' 'freifunk_seefeld'
+
+config 'community' 'duesseldorf'
+	option 'name' 'Freifunk Duesseldorf'
+	option 'homepage' 'http://wiki.piratenpartei.de/D%C3%BCsseldorf/Freifunk'
+	option 'ssid' 'duesseldorf.freifunk.net'
+	option 'mesh_network' '10.40.0.0/16'
+	option 'splash_network' '10.104.0.0/16'
+	option 'splash_prefix' '27'
+	option 'external' 'freifunk_duesseldorf'
+
 config 'community' 'ljubljana'
 	option 'name' 'Kiberpipa.net (wlan-lj)'
 	option 'homepage' 'http://www.kiberpipa.net'
@@ -182,3 +202,4 @@ config 'community' 'ljubljana'
 	option 'splash_network' '10.14.128.0/17'
 	option 'splash_prefix' '27'
 	option 'external' 'freifunk_ljubljana'
+
diff --git a/modules/freifunk/root/etc/config/freifunk_augsburg b/modules/freifunk/root/etc/config/freifunk_augsburg
index f68600c26..6b223bed3 100644
--- a/modules/freifunk/root/etc/config/freifunk_augsburg
+++ b/modules/freifunk/root/etc/config/freifunk_augsburg
@@ -1,2 +1,5 @@
-config defaults interface
-    option netmask  255.255.0.0
\ No newline at end of file
+package 'freifunk_augsburg'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.0.0'
+
diff --git a/modules/freifunk/root/etc/config/freifunk_berlin b/modules/freifunk/root/etc/config/freifunk_berlin
index 65bde7666..467c3c4a6 100644
--- a/modules/freifunk/root/etc/config/freifunk_berlin
+++ b/modules/freifunk/root/etc/config/freifunk_berlin
@@ -1,2 +1,5 @@
-config defaults wifi_device
-	option channel 10
\ No newline at end of file
+package 'freifunk_berlin'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '10'
+
diff --git a/modules/freifunk/root/etc/config/freifunk_duesseldorf b/modules/freifunk/root/etc/config/freifunk_duesseldorf
new file mode 100644
index 000000000..945cba649
--- /dev/null
+++ b/modules/freifunk/root/etc/config/freifunk_duesseldorf
@@ -0,0 +1,11 @@
+package 'freifunk_duesseldorf'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.0.0'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '3'
+
+config 'defaults' 'wifi_iface'
+	option 'bssid' '02:CA:FF:EE:BA:BE'
+
diff --git a/modules/freifunk/root/etc/config/freifunk_hamburg b/modules/freifunk/root/etc/config/freifunk_hamburg
index c3ca76128..4f9abdf02 100644
--- a/modules/freifunk/root/etc/config/freifunk_hamburg
+++ b/modules/freifunk/root/etc/config/freifunk_hamburg
@@ -1,5 +1,8 @@
-config defaults interface
-	option netmask  255.240.0.0
+package 'freifunk_hamburg'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.240.0.0'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '1'
 
-config defaults wifi_device
-	option channel 1
diff --git a/modules/freifunk/root/etc/config/freifunk_hannover b/modules/freifunk/root/etc/config/freifunk_hannover
index f797a938f..10200f774 100644
--- a/modules/freifunk/root/etc/config/freifunk_hannover
+++ b/modules/freifunk/root/etc/config/freifunk_hannover
@@ -1,5 +1,8 @@
-config defaults wifi_iface
-    option bssid    CA:FF:EE:CA:FF:EE
-    
-config defaults interface
-    option netmask  255.255.0.0
\ No newline at end of file
+package 'freifunk_hannover'
+
+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/freifunk_jena b/modules/freifunk/root/etc/config/freifunk_jena
index 716d6d69e..cc8bb311d 100644
--- a/modules/freifunk/root/etc/config/freifunk_jena
+++ b/modules/freifunk/root/etc/config/freifunk_jena
@@ -1,2 +1,5 @@
+package 'freifunk_jena'
+
 config 'defaults' 'interface'
 	option 'dns' '88.198.178.18 141.54.1.1 212.204.49.83'
+
diff --git a/modules/freifunk/root/etc/config/freifunk_ljubljana b/modules/freifunk/root/etc/config/freifunk_ljubljana
index 8ca934516..437d039de 100644
--- a/modules/freifunk/root/etc/config/freifunk_ljubljana
+++ b/modules/freifunk/root/etc/config/freifunk_ljubljana
@@ -1,5 +1,8 @@
-config defaults wifi_device
-	option channel 8
+package 'freifunk_ljubljana'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '8'
 
 config 'defaults' 'interface'
 	option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222'
+
diff --git a/modules/freifunk/root/etc/config/freifunk_mainz b/modules/freifunk/root/etc/config/freifunk_mainz
index 52458d4f9..e50f6f11b 100644
--- a/modules/freifunk/root/etc/config/freifunk_mainz
+++ b/modules/freifunk/root/etc/config/freifunk_mainz
@@ -1,8 +1,11 @@
-config defaults wifi_iface
-	option bssid    02:ca:ff:ee:ba:be
+package 'freifunk_mainz'
 
-config defaults wifi_device
-	option channel	1
+config 'defaults' 'wifi_iface'
+	option 'bssid' '02:ca:ff:ee:ba:be'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '1'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.0.0'
 
-config defaults interface
-	option netmask	255.255.0.0
diff --git a/modules/freifunk/root/etc/config/freifunk_potsdam b/modules/freifunk/root/etc/config/freifunk_potsdam
index 0c4f8873f..feb7fb5d6 100644
--- a/modules/freifunk/root/etc/config/freifunk_potsdam
+++ b/modules/freifunk/root/etc/config/freifunk_potsdam
@@ -1,5 +1,8 @@
-config defaults interface
-	option netmask  255.255.0.0
+package 'freifunk_potsdam'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.0.0'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '13'
 
-config defaults wifi_device
-	option channel 13
diff --git a/modules/freifunk/root/etc/config/freifunk_seefeld b/modules/freifunk/root/etc/config/freifunk_seefeld
new file mode 100644
index 000000000..7a2346f1c
--- /dev/null
+++ b/modules/freifunk/root/etc/config/freifunk_seefeld
@@ -0,0 +1,9 @@
+package 'freifunk_seefeld'
+
+config 'defaults' 'interface'
+	option 'netmask' '255.255.255.0'
+
+config 'defaults' 'wifi_device'
+	option 'channel' '1'
+	option 'bssid' '02:CA:FF:EE:BA:BB'
+