X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Ffreifunk%2Froot%2Fetc%2Fconfig%2Ffreifunk;h=09d92d92b3e6c8b71f6b973b8e3022d6ddd4ad10;hp=b0009703f88c298c290c4df6c6007e7d27d381e6;hb=876b191b20a01926657e4d3c618fd2f029f45f4d;hpb=518d981c9274c66820d1e4651b375a9cbec8fd7c

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index b0009703f..09d92d92b 100644
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -1,7 +1,5 @@
 package 'freifunk'
 
-config 'settings' 'wizard'
-
 config 'public' 'contact'
 	option 'nickname' ''
 	option 'name' ''
@@ -14,74 +12,118 @@ config 'public' 'community'
 	option 'name' 'Freifunk'
 	option 'homepage' 'http://freifunk.net'
 
-config 'fw_rule' 'icmp'
+config 'fw_zone' 'zone_freifunk'
+	option 'name' 'freifunk'
+	option 'input' 'REJECT'
+	option 'forward' 'REJECT'
+	option 'output' 'ACCEPT'
+
+config 'fw_rule' 'fficmp'
 	option 'src' 'freifunk'
 	option 'target' 'ACCEPT'
 	option 'proto' 'icmp'
 
-config 'fw_rule' 'http'
+config 'fw_rule' 'ffhttp'
 	option 'src' 'freifunk'
 	option 'target' 'ACCEPT'
 	option 'proto' 'tcp'
 	option 'dest_port' '80'
 
-config 'fw_rule' 'https'
+config 'fw_rule' 'ffhttps'
 	option 'src' 'freifunk'
 	option 'target' 'ACCEPT'
 	option 'proto' 'tcp'
 	option 'dest_port' '443'
 
-config 'fw_rule' 'ssh'
+config 'fw_rule' 'ffssh'
 	option 'src' 'freifunk'
 	option 'target' 'ACCEPT'
 	option 'proto' 'tcp'
 	option 'dest_port' '22'
 
-config 'fw_rule' 'olsr'
+config 'fw_rule' 'ffolsr'
 	option 'src' 'freifunk'
 	option 'target' 'ACCEPT'
 	option 'proto' 'udp'
 	option 'dest_port' '698'
 
-config 'fw_rule' 'wprobe'
+config 'fw_rule' 'ffwprobe'
 	option 'src' 'freifunk'
 	option 'target' 'ACCEPT'
 	option 'proto' 'tcp'
 	option 'dest_port' '17990'
 
-config 'fw_forwarding' 'lan'
+config 'fw_rule' 'ffdns'
+	option 'dest_port' '53'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'udp'
+
+config 'fw_rule' 'ffdhcp'
+	option 'src_port' '68'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'dest_port' '67'
+	option 'proto' 'udp'
+	option 'leasetime' '30m'
+
+config 'fw_rule' 'ffsplash'
+	option 'dest_port' '8082'
+	option 'src' 'freifunk'
+	option 'target' 'ACCEPT'
+	option 'proto' 'tcp'
+
+config 'fw_forwarding' 'lanfffwd'
 	option 'src' 'lan'
 	option 'dest' 'freifunk'
 
+config 'fw_forwarding' 'ffwanfwd'
+	option 'src' 'freifunk'
+	option 'dest' 'wan'
+
 config 'fw_forwarding' 'fffwd'
 	option 'src' 'freifunk'
 	option 'dest' 'freifunk'
 
+config 'include' 'freifunk'
+	option 'path' '/etc/firewall.freifunk'
+
+config 'defaults' 'system'
+	option 'zonename' 'Europe/Berlin'
+	option 'timezone' 'CET-1CEST,M3.5.0,M10.5.0/3'
+
 config 'defaults' 'wifi_device'
 	option 'channel' '1'
 	option 'diversity' '1'
 	option 'disabled' '0'
-	option 'txpower' '15'
-	option 'country' '276'
+	option 'country' 'DE'
+	option 'hwmode' '11g'
+	option 'distance' '1000'
 
 config 'defaults' 'wifi_iface'
 	option 'mode' 'adhoc'
-	option 'bssid' '02:CA:FF:EE:BA:BE'
+	option 'encryption' 'none'
+	option 'bgscan' '0'
+	option 'bssid' '12:CA:FF:EE:BA:BE'
 	option 'sw_merge' '1'
+	option 'mcast_rate' '5500'
+	option 'probereq' '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'
+	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'
+	option 'force' '1'
 
-config 'defaults' 'olsr_interface'
+config 'defaults' 'olsr_interfacedefaults'
 	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'
+