Add new meshwizard (WIP)

4 files changed, 61 insertions, 23 deletions

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index 9aa3f27c3..e69662cbb 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,45 +12,75 @@ 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'
@@ -61,13 +89,18 @@ 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.255.0.0'
@@ -79,9 +112,10 @@ config 'defaults' 'alias'
 config 'defaults' 'dhcp'
 	option 'leasetime' '30m'
 
-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'
+
diff --git a/modules/freifunk/root/etc/config/profile_-custom b/modules/freifunk/root/etc/config/profile_-custom
deleted file mode 100644
index 6335be48f..000000000
--- a/modules/freifunk/root/etc/config/profile_-custom
+++ /dev/null
@@ -1,10 +0,0 @@
-config 'community'	'profile'
-	option 'name' 'Custom'
-	option 'homepage' 'http://example.freifunk.net'
-	option 'ssid' 'example.freifunk.net'
-	option 'splash_network' '10.104.0.0/16'
-	option 'latitude' '52.000'
-	option 'longitude' '10.000'
-	option 'splash_prefix' '28'
-	option 'mesh_network' '1.0.0.0/16'
-
diff --git a/modules/freifunk/root/etc/config/profile_Freifunk b/modules/freifunk/root/etc/config/profile_Freifunk
new file mode 100644
index 000000000..b8f445a73
--- /dev/null
+++ b/modules/freifunk/root/etc/config/profile_Freifunk
@@ -0,0 +1,10 @@
+config 'community' 'profile'
+	option 'name' 'Freifunk'
+	option 'homepage' 'http://freifunk.net'
+	option 'ssid' 'www.freifunk.net'
+	option 'splash_network' '10.104.0.0/16'
+	option 'latitude' '52.000'
+	option 'longitude' '10.000'
+	option 'splash_prefix' '28'
+	option 'mesh_network' '10.0.0.0/8'
+
diff --git a/modules/freifunk/root/etc/config/profile_augsburg b/modules/freifunk/root/etc/config/profile_augsburg
index fd5cdda59..d31558585 100644
--- a/modules/freifunk/root/etc/config/profile_augsburg
+++ b/modules/freifunk/root/etc/config/profile_augsburg
@@ -12,3 +12,7 @@ config 'community' 'profile'
 config 'defaults' 'interface'
         option 'netmask' '255.255.192.0'
 
+config 'defaults' 'bssidscheme'
+	option '1'	'02:CA:FF:EE:BA:BE'
+	option '13'	'13:CA:FF:EE:BA:BE'
+