X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Ffreifunk%2Froot%2Fetc%2Fconfig%2Ffreifunk;h=9aa3f27c3439555a6b84c9120f8974de9dc45807;hp=12a0407fff51424cef08e903c2f232a67423c9c5;hb=f8ef4ff722377e41a6a8f57caed287c25846bf8d;hpb=d688dad6115cf4b40ee44b35cc391537b71fabd1

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index 12a0407ff..9aa3f27c3 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -1,88 +1,87 @@
-config public contact
-	option nickname
-	option name
-	option mail
-	option phone
-	option location
-	option geo
-	option note
-
-config public community
-    option name     "Freifunk Halle"
-    option homepage http://halle.freifunk.net
-    option realm    netz.freifunk-halle.net
-    
-config settings wizard
-	    
-
-config fw_rule http
-	option source freifunk
-	option target ACCEPT
-	option proto  tcp
-	option dest_port 80
-	
-config fw_rule https
-	option source freifunk
-	option target ACCEPT
-	option proto  tcp
-	option dest_port 443
-	 
-config fw_rule ssh
-	option source freifunk
-	option target ACCEPT
-	option proto  tcp
-	option dest_port 22
-
-config fw_rule olsr
-	option source freifunk
-	option target ACCEPT
-	option proto  udp
-	option dest_port 698
-	
-config fw_forwarding lan
-	option src lan
-	option dest freifunk
-
-    
-
-config defaults wifi_device
-    option channel   1
-    option txantenna 1
-    option rxantenna 1
-    option txant 1
-    option rxant 1
-    option diversity 0
-    option disabled 0
-    
-
-config defaults wifi_iface
-    option mode		adhoc
-    option ssid     halle.freifunk.net
-    option bssid    02:CA:FF:EE:BA:BE
-    option txpower  10
-    option rts		2347
-    option frag		512
-    
-    
-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	HelloInterval 6.0
-	option	HelloValidityTime 108.0
-	option	TcInterval 4.0
-	option	TcValidityTime 324.0
-	option	MidInterval 18.0
-	option	MidValidityTime 324.0
-	option	HnaInterval 18.0
-	option	HnaValidityTime 108.0
\ No newline at end of file
+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.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'
+
+config 'defaults' 'dhcp'
+	option 'leasetime' '30m'
+
+config 'defaults' 'olsr_interface'
+	option 'Ip4Broadcast' '255.255.255.255'
+
+config 'defaults' 'upgrade'
+	option 'repository' 'http://dev.luci.freifunk-halle.net/freifunk-snapshots'
+	option 'rssfeed' 'http://firmware.leipzig.freifunk.net/kamikaze/.rss.xml'