X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Ffreifunk%2Froot%2Fetc%2Fconfig%2Ffreifunk;h=c8eeee22368a2e4d13a158d04c61c093cd2b05a8;hp=832f69da3abfe0f21bea4a2bc36ac3b8c4728104;hb=bb48f0b5c544907661f79cf5fdd6e3809125805d;hpb=b29afca6bee55d0d228d82d2468822a19ac5d38b

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index 832f69da3..c8eeee223 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -1,32 +1,33 @@
+config settings wizard
 config public contact
-	option nickname
-	option name
-	option mail
-	option phone
-	option location
-	option geo
-	option note
+	option nickname ''
+	option name ''
+	option mail ''
+	option phone ''
+	option location ''
+	option note ''
 
 config public community
-    option name     "Freifunk Halle"
-    option homepage http://halle.freifunk.net
-    option realm    netz.freifunk-halle.net
-    
-config settings wizard
-	    
+	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
@@ -38,51 +39,80 @@ config fw_rule olsr
 	option target ACCEPT
 	option proto  udp
 	option dest_port 698
-	
+
 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 txantenna 1
-    option rxantenna 1
-    option txant 1
-    option rxant 1
-    option diversity 0
-    option disabled 0
-    
+    option diversity 1
+    option disabled  0
+    option txpower   10
+
 
 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
-    
-    
+    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 
-	
-	
+	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
+
+
+config community leipzig
+	option name "Freifunk Leipzig"
+	option homepage http://leipzig.freifunk.net
+	option ssid "leipzig.freifunk.net"
+	option prefix "104.61"
+
+config community halle
+	option name "Freifunk Halle"
+	option homepage http://halle.freifunk.net
+	option ssid "halle.freifunk.net"
+	option prefix "104.62"
+
+config community l59
+	option name "Freifunk L59"
+	option homepage http://freifunk.net
+	option ssid "start.freifunk.net"
+	option prefix "104.59"
+
+config community berlin
+	option name "Freifunk Berlin"
+	option homepage http://berlin.freifunk.net
+	option ssid "olsr.freifunk.net"
+	option prefix "104"
+	option external freifunk_berlin
+
+config community hannover
+	option name "Freifunk Hannover"
+	option homepage http://hannover.freifunk.net
+	option ssid "hannover.freifunk.net"
+	option prefix "10.2"
+	option external freifunk_hannover
+
+config community augsburg
+	option name "Freifunk Augsburg"
+	option homepage http://augsburg.freifunk.net
+	option ssid "augsburg.freifunk.net"
+	option prefix "191.161"
+	option external freifunk_augsburg