Changeset 94c9e9e68a52a85cada2842d74d51b9407ccf5b2

Timestamp:

04/23/09 10:19:24 (3 years ago)

Author:

Neutron Soutmun <neo.neutron@…>

Children:

aace70f808787e6416462b9148cc6777dd2b0ec3

Parents:

32a2b8614528260422ecc05a560bd58085982248

git-committer:

Neutron Soutmun <neo.neutron@…> (04/23/09 10:19:24)

Message:

Handle start-stop process, fix firewall script

2009-04-23 Neutron Soutmun <neo.neutron@…>

• example/rahunas.init.in:
  • Adjust the code to handle the start and stop process.
  • Waiting for the process really stop.
• tools/firewall.sh.in: Prevent the script to start the same rules again for each virtual server.

Files:

• ChangeLog (modified) (1 diff)
• example/rahunas.init.in (modified) (2 diffs)
• tools/firewall.sh.in (modified) (8 diffs)

ChangeLog

@@ +1 @@
+2009-04-23  Neutron Soutmun <neo.neutron@gmail.com>
+
+        * example/rahunas.init.in: 
+          - Adjust the code to handle the start and stop process.
+          - Waiting for the process really stop.
+        * tools/firewall.sh.in: Prevent the script to start the same rules again for 
+          each virtual server.
+
 2009-04-21  Neutron Soutmun <neo.neutron@gmail.com>
 

example/rahunas.init.in

@@ -22 +22 @@
 WEBLOGIN_CONFIG=@sysconfdir@/rahunas/weblogin-config-update.sh
 NAME=rahunasd
-DESC="RahuNAS: Rahu Network Access Server"
+DESC="RahuNAS - Rahu Network Access Server"
 
 
@@ -36 +36 @@
 . $INIT 
 
-case "$1" in
-  start)
-        echo -n "Starting $DESC: "
+. /lib/lsb/init-functions
 
+PID=@localstatedir@/run/$NAME.pid
+
+start () {
   $FIREWALL start
   $WEBLOGIN_CONFIG
 
-        if [ "$RUN_DAEMON" = "yes" ]; then
-                start-stop-daemon --start --quiet --pidfile @localstatedir@/run/$NAME.pid \
-                --exec $DAEMON
-                echo done
-        else
-                echo disabled 
-        fi
-        ;;
+  start-stop-daemon --start --quiet \
+    --pidfile $PID --exec $DAEMON < /dev/null
+  return $?
+}
+
+stop () {
+  start-stop-daemon --stop --quiet \
+    --pidfile $PID --name $NAME < /dev/null
+
+  # Wait until the rahunasd has really stopped.
+  sleep 2
+  if test -n "$PID" && kill -0 $PID 2>/dev/null
+  then
+    log_action_begin_msg " ... Waiting"
+    cnt=0
+    while kill -0 $PID 2>/dev/null
+    do
+      cnt=`expr $cnt + 1`
+      if [ $cnt -gt 24 ]
+      then
+        log_action_end_msg 1
+        return 1
+      fi
+      sleep 5
+      log_action_cont_msg ""
+    done
+
+    log_action_end_msg 0
+  fi
+
+  $FIREWALL stop
+  return 0
+}
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting $DESC" "$NAME"
+  
+    if [ "$RUN_DAEMON" = "yes" ]; then
+      if start ; then
+        log_end_msg $?
+      else
+        log_end_msg $?
+      fi
+    else
+      log_end_msg "disabled, to enable see $INIT"
+    fi
+    ;;
   stop)
-        echo -n "Stopping $DESC: "
+    log_daemon_msg "Stopping $DESC" "$NAME"
+  
+    if stop ; then
+      log_end_msg $?
+    else
+      log_end_msg $?
+    fi
+    ;;
+  restart)
+    log_daemon_msg "Restarting $DESC" "$NAME"
+    stop
 
-        start-stop-daemon --stop --oknodo --quiet --pidfile @localstatedir@/run/$NAME.pid \
-                --exec $DAEMON
-        echo done 
-        $FIREWALL stop
-        ;;
-  restart|force-reload)
-        echo -n "Restarting $DESC: "
-
-        start-stop-daemon --stop --oknodo --quiet --pidfile \
-                @localstatedir@/run/$NAME.pid --exec $DAEMON
-        sleep 1
-
-        $FIREWALL restart
-
-        start-stop-daemon --start --quiet --pidfile \
-                @localstatedir@/run/$NAME.pid --exec $DAEMON
-        echo "$NAME."
-        ;;
+    if [ "$RUN_DAEMON" = "yes" ]; then
+      if start ; then
+        log_end_msg $?
+      else
+        log_end_msg $?
+      fi
+    else
+      log_end_msg "disabled, to enable see $INIT"
+    fi
+    ;;
+  status)
+    status_of_proc -p "$PID" "$DAEMON" "$NAME" && exit 0 || exit $?
+    ;;
   *)
-        N=@sysconfdir@/init.d/$NAME
-        echo "Usage: $N {start|stop|restart|force-reload}" >&2
-        exit 1
-        ;;
+    N=@sysconfdir@/init.d/$NAME
+    echo "Usage: $N {start|stop|restart|status}" >&2
+    exit 1
+    ;;
 esac
 

tools/firewall.sh.in

@@ -14 +14 @@
 INIT=@sysconfdir@/default/rahunas
 RUN=@localstatedir@/run/rahunas-firewall
+RUNDIR=@localstatedir@/run/rahunas-set
 VSERVER_LIST=@localstatedir@/run/rahunas-vserver
 
@@ -21 +22 @@
 . $INIT
 
-test "$RUN_DAEMON" = "yes" || exit 0
 test -f $RAHUNAS_CONFIG || exit 1
 test -f $VSERVER_LIST || touch $VSERVER_LIST
+test -d $RUNDIR || mkdir -p $RUNDIR
 
 get_section_name () {
@@ -624 +625 @@
 
 start () {
+  test "$RUN_DAEMON" = "yes" || return 0
   test ! -f $RUN || return 0
 
@@ -651 +653 @@
 
 start_config() {
+  test ! -f $RUNDIR/$SETNAME || return 0
   add_set
   new_chains
   rules
+  touch $RUNDIR/$SETNAME
+  return 0
 }
 
@@ -659 +664 @@
   do_get_config "" start
   start_config
+  return $?
 }
 
@@ -665 +671 @@
   do_get_config $file start
   if [ $? -gt 0 ]; then
-    return
+    return 1
   fi 
   
   start_config
+  return $?
 }
 
 stop_config() {
+  test -f $RUNDIR/$SETNAME || return 0
   cleanup
   cleanup_set
+  rm -f $RUNDIR/$SETNAME
+  return 0
 }
 
@@ -679 +689 @@
   do_get_config "" stop
   stop_config
+  return $?
 }
 
@@ -685 +696 @@
   do_get_config $file stop
   if [ $? -gt 0 ]; then
-    return
+    return 1
   fi 
 
   stop_config
+  return $?
 }