Merge branch 'plugnpray' of git://git.freifunk-jena.de/freifunk/ffj-buildroot-v2 into plugnpray

3 files changed, 12 insertions, 2 deletions

diff --git a/files/common/etc/config/system b/files/common/etc/config/system
index a84daf2..80d6155 100644
--- a/files/common/etc/config/system
+++ b/files/common/etc/config/system
@@ -2,6 +2,16 @@ config system
 	option hostname FFJ
 	option timezone CET
 
+config mesh mesh
+	option webif_password ''
+	option qos false
+	option vpn false
+	option filter_wan true
+
+config position position
+       option public true
+       option automatic true
+
 config 'timeserver'
        list 'server' 'ntp1.ptb.de'
        list 'server' 'ntp2.ptb.de'
diff --git a/files/common/etc/fsm/inetable/trans/queen.enter b/files/common/etc/fsm/inetable/trans/queen.enter
index 9753a81..a7c5539 100755
--- a/files/common/etc/fsm/inetable/trans/queen.enter
+++ b/files/common/etc/fsm/inetable/trans/queen.enter
@@ -54,7 +54,7 @@ set dhcp.mesh.end_ip=$dhcp_end
 ## set splash
 # start redirection httpd (for splash), add GW IP to the addrs service
 # httpd listens on
-echo "http://$gwip/cgi-bin/splash? /sbin/urlencode" > /tmp/redirection_target
+echo "http://$gwip/cgi-bin/splash.html? /sbin/urlencode" > /tmp/redirection_target
 enable_httpd redirection    $gwip:81
 change_service_httpd_listen $gwip:80
 /etc/init.d/uhttpd restart
diff --git a/files/common/etc/fsm/inetable/trans/robinson.enter b/files/common/etc/fsm/inetable/trans/robinson.enter
index 42e97cb..38ae604 100755
--- a/files/common/etc/fsm/inetable/trans/robinson.enter
+++ b/files/common/etc/fsm/inetable/trans/robinson.enter
@@ -38,7 +38,7 @@ set dhcp.fakedns.name='#'
 batctl gw off
 
 # start redirection httpd, add robinson IP to service httpd
-echo "http://$randip/robinson.html" > /tmp/redirection_target
+echo "http://$randip/" > /tmp/redirection_target
 enable_httpd redirection    $randip:81
 change_service_httpd_listen $randip:80
 /etc/init.d/uhttpd restart