Move DEBUG information from init script to default file

[gosa.git] / gosa-si / debian / gosa-si-common.init

diff --git a/gosa-si/debian/gosa-si-common.init b/gosa-si/debian/gosa-si-common.init
index 529495edcab1e288b1b8f7eb16d60b0deaad745d..d155ef8029fbbce6690d31aef5b778661e9a0ee3 100755 (executable)
--- a/gosa-si/debian/gosa-si-common.init
+++ b/gosa-si/debian/gosa-si-common.init
@@ -7,14 +7,13 @@
 # Required-Stop:     $syslog $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: GOsa message bus and server component
+# Short-Description: GOsa message server/client component
 # Description:       gosa-si establishes the communication between a couple of
 #                    GOsa hosting servers and optionally clients to do event
 #                    signaling for all communication partners.
 ### END INIT INFO
 
 # Load defaults
-START_BUS=0
 [ -r /etc/default/gosa-si ] && . /etc/default/gosa-si
 
 # Load LSB support functions
@@ -22,88 +21,61 @@ START_BUS=0
 
 
 start_client() {
-       start-stop-daemon --start --quiet --pidfile /var/run/gosa-si-client.pid --name gosa-si-client --startas /usr/sbin/gosa-si-client -vvv
-}
-
-
-start_bus() {
-       start-stop-daemon --start --quiet --pidfile /var/run/gosa-si-bus.pid --name gosa-si-bus --startas /usr/sbin/gosa-si-bus -vvv
+       start-stop-daemon --start --quiet --pidfile /var/run/gosa-si-client.pid --name gosa-si-client --startas /usr/sbin/gosa-si-client -- $DEBUG
 }
 
 
 start_server() {
-       start-stop-daemon --start --quiet --pidfile /var/run/gosa-si-server.pid --name gosa-si-server --startas /usr/sbin/gosa-si-server -- $1 -vvv
+       start-stop-daemon --start --quiet --pidfile /var/run/gosa-si-server.pid --name gosa-si-server --startas /usr/sbin/gosa-si-server -- $1 $DEBUG
 }
 
 
 stop_client() {
        start-stop-daemon --stop --retry 5 --quiet --pidfile /var/run/gosa-si-client.pid --name gosa-si-client
-}
-
-
-stop_bus() {
-       start-stop-daemon --stop --retry 5 --quiet --pidfile /var/run/gosa-si-bus.pid --name gosa-si-bus
+       kill `ps -C gosa-si-client -o pid=` > /dev/null 2>&1
+       ! ps -C gosa-si-client -o pid= > /dev/null 2>&1
 }
 
 
 stop_server() {
        start-stop-daemon --stop --retry 5 --quiet --pidfile /var/run/gosa-si-server.pid --name gosa-si-server
+       kill `ps -C gosa-si-server -o pid=` > /dev/null 2>&1
+       ! ps -C gosa-si-server -o pid= > /dev/null 2>&1
 }
 
 
 case "$1" in
 start)  log_daemon_msg "Starting GOsa support infrastructure"
        if [ -x /usr/sbin/gosa-si-server ]; then
-               if [ "$START_BUS" == "1" ]; then
-                       log_progress_msg "bus"
-                       start_bus
-                       log_progress_msg "daemon"
-                       start_server
-               else
-                       log_progress_msg "daemon"
-                       start_server --no-bus
-               fi
+               log_progress_msg "daemon"
+               start_server
        fi
-       if [ "$START_CLIENT" == "1" -a -x /usr/sbin/gosa-si-client ]; then
+       if [ "$START_CLIENT" = "1" -a -x /usr/sbin/gosa-si-client ]; then
                log_progress_msg "client"
                start_client
        fi
         log_end_msg $?
        ;;
 stop)   log_daemon_msg "Stopping GOsa support infrastructure"
-       if [ "$START_CLIENT" == "1" -a -x /usr/sbin/gosa-si-client ]; then
+       if [ "$START_CLIENT" = "1" -a -x /usr/sbin/gosa-si-client ]; then
                log_progress_msg "client"
                stop_client
        fi
        if [ -x /usr/sbin/gosa-si-server ]; then
-               if [ "$START_BUS" == "1" ]; then
-                       log_progress_msg "daemon"
-                       stop_server
-                       log_progress_msg "bus"
-                       stop_bus
-               else
-                       log_progress_msg "daemon"
-                       stop_server
-               fi
+               log_progress_msg "daemon"
+               stop_server
        fi
         log_end_msg $?
         ;;
 reload|force-reload|restart) log_daemon_msg "Restarting GOsa support infrastructure" 
-       if [ "$START_CLIENT" == "1" -a -x /usr/sbin/gosa-si-client ]; then
+       if [ "$START_CLIENT" = "1" -a -x /usr/sbin/gosa-si-client ]; then
                stop_client
        fi
        if [ -x /usr/sbin/gosa-si-server ]; then
-               if [ "$START_BUS" == "1" ]; then
-                       stop_server
-                       stop_bus
-                       start_bus
-                       start_server --no-bus
-               else
-                       stop_server
-                       start_server --no-bus
-               fi
+               stop_server
+               start_server
        fi
-       if [ "$START_CLIENT" == "1" -a -x /usr/sbin/gosa-si-client ]; then
+       if [ "$START_CLIENT" = "1" -a -x /usr/sbin/gosa-si-client ]; then
                start_client
        fi
        log_progress_msg "done"