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 ad47a25..31ffb78 100755 (executable)
--- a/applications/luci-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-splash/root/etc/init.d/luci_splash
@@ -47,6 +47,23 @@ whitelist_add() {
 
 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
 }
 
@@ -78,12 +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 -m -p /var/run/luci-splashd.pid -b -q -x /usr/bin/luci-splashd
 }
 
 stop() {
@@ -100,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 -p /var/run/luci-splashd.pid -s KILL -q
        
        sed -ie '/\/usr\/sbin\/luci-splash sync/d' /var/spool/cron/crontabs/root
 }