Removed bus functionality from debian start script

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11144 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/debian/gosa-si-common.init b/gosa-si/debian/gosa-si-common.init
index 6cde8872554c51fa1fb9dd828f3db24f4b0a9348..d105802afbe4ea975053867378038dbe0f03c5f0 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
 DEBUG=-vvv
 [ -r /etc/default/gosa-si ] && . /etc/default/gosa-si
 
@@ -27,11 +26,6 @@ start_client() {
 }
 
 
-start_bus() {
-       start-stop-daemon --start --quiet --pidfile /var/run/gosa-si-bus.pid --name gosa-si-bus --startas /usr/sbin/gosa-si-bus -- $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 $DEBUG
 }
@@ -43,12 +37,6 @@ stop_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-bus -o pid=` &> /dev/null
-}
-
-
 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
@@ -58,15 +46,8 @@ stop_server() {
 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
                log_progress_msg "client"
@@ -80,15 +61,8 @@ stop)   log_daemon_msg "Stopping GOsa support infrastructure"
                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 $?
         ;;
@@ -99,12 +73,10 @@ reload|force-reload|restart) log_daemon_msg "Restarting GOsa support infrastruct
        if [ -x /usr/sbin/gosa-si-server ]; then
                if [ "$START_BUS" == "1" ]; then
                        stop_server
-                       stop_bus
-                       start_bus
-                       start_server --no-bus
+                       start_server
                else
                        stop_server
-                       start_server --no-bus
+                       start_server
                fi
        fi
        if [ "$START_CLIENT" == "1" -a -x /usr/sbin/gosa-si-client ]; then