X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Ffreifunk%2Froot%2Fetc%2Fconfig%2Ffreifunk;h=13f6f02f565690d370a15ffb725bf362ad0b7c8c;hp=31964d0bb4cea9662d9212df6a203facc5f2719e;hb=45e20225a51f66b8ba001c98a2c534bc251143ee;hpb=71adba8a50570257892b60dd9872191c54dd7041

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index 31964d0bb..13f6f02f5 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -11,6 +11,11 @@ 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
@@ -35,6 +40,12 @@ config fw_rule olsr
 	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
@@ -46,81 +57,110 @@ config fw_forwarding fffwd
 
 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   15
+    option country   276
 
 config defaults wifi_iface
     option mode		adhoc
     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
+	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 prefix "104.61"
+	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 prefix "104.62"
+	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 prefix "104.59"
+	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 prefix "104"
+	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 prefix "10.2"
+	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 prefix "191.161"
-	option external freifunk_augsburg
\ No newline at end of file
+	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 'external' 'freifunk_jena'