LuCId

[project/luci.git] / applications / luci-splash / root / etc / init.d / luci_splash

diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash
index 2d563d1..31ffb78 100755 (executable)
--- a/applications/luci-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-splash/root/etc/init.d/luci_splash
@@ -25,6 +25,12 @@ iface_add() {
        iptables -t nat -A luci_splash_prerouting -s "$NETWORK/$PREFIX" -d "$ipaddr" -p tcp -m multiport ! --dport 22,80,443 -j luci_splash_portal
 }
 
+iface_del() {
+       config_get zone "$1" zone                                                                
+       [ -n "$zone" ] || return 0
+       while iptables -t nat -D prerouting_${zone} -j luci_splash_prerouting 2>&-; do :; done
+}
+
 blacklist_add() {
        local cfg="$1"
        
@@ -39,6 +45,28 @@ whitelist_add() {
        [ -n "$mac" ] && iptables -t nat -I luci_splash_leases -m mac --mac-source "$mac" -j RETURN
 }
 
+boot() {
+       ### We are started by the firewall include
+
+       uci get lucid.splashr || {
+uci batch <<EOF
+       set lucid.splashr=daemon
+       set lucid.splashr.slave=httpd
+       add_list lucid.splashr.address=8082
+       add_list lucid.splashr.publisher=splashredir
+       set lucid.splashr.enabled=1
+
+       set lucid.splashredir=Redirector
+       set lucid.splashredir.name=Splashd
+       set lucid.splashredir.virtual='/'
+       set lucid.splashredir.physical=':80/luci/splash'
+
+       commit lucid
+EOF
+       }
+       exit 0
+}
+
 start() {
        ### Read chains from config
        include /lib/network
@@ -67,18 +95,10 @@ start() {
        iptables -t nat -A luci_splash_leases -j DROP
        
        ### Add crontab entry
-       grep luci-splash /var/spool/cron/crontabs/root >/dev/null 2>&1 || {
-               echo '*/5 * * * *       /usr/sbin/luci-splash sync' >> /var/spool/cron/crontabs/root
+       test -f /etc/crontabs/root || touch /etc/crontabs/root
+       grep -q luci-splash /etc/crontabs/root || {
+               echo '*/5 * * * *       /usr/sbin/luci-splash sync' >> /etc/crontabs/root
        }
-
-       ### Start the splash httpd
-       start-stop-daemon -S -b -q -x /usr/bin/luci-splashd
-}
-
-iface_del() {
-       config_get zone "$1" zone                                                                
-       [ -n "$zone" ] || return 0
-       while iptables -t nat -D prerouting_${zone} -j luci_splash_prerouting 2>&-; do :; done
 }
 
 stop() {
@@ -95,9 +115,6 @@ stop() {
        iptables -t nat -X luci_splash_leases
        iptables -t nat -X luci_splash_portal
        iptables -t nat -X luci_splash_prerouting
-
-       ### Stop the splash httpd
-       start-stop-daemon -K -q -x /usr/bin/luci-splashd
        
        sed -ie '/\/usr\/sbin\/luci-splash sync/d' /var/spool/cron/crontabs/root
 }