diff --git a/examples/linux/init/dmsctl.sh b/examples/linux/init/dmsctl.sh index db466f1..b485dc8 100644 --- a/examples/linux/init/dmsctl.sh +++ b/examples/linux/init/dmsctl.sh @@ -11,15 +11,17 @@ RETVAL=0 PID="" ERROR=0 SERVER=all -USEXVFB=0 VDISPLAY="99" -INSTALL_PATH=@@BITROCK_INSTALLDIR@@ +INSTALL_PATH=/opt/ktdms JAVABIN=$INSTALL_PATH/java/jre/bin/java export MAGICK_HOME=$INSTALL_PATH/common export LD_LIBRARY_PATH="$INSTALL_PATH/apache2/lib:$INSTALL_PATH/common/lib:$INSTALL_PATH/mysql/lib:$LD_LIBRARY_PATH" export PATH=$PATH:$INSTALL_PATH/php/bin export PHPRC=$INSTALL_PATH/php/etc +# LDAP +export LDAPCONF=$INSTALL_PATH/common/etc/openldap/ldap.conf + # Apache HTTPD_PIDFILE=$INSTALL_PATH/apache2/logs/httpd.pid HTTPD_PID="" @@ -29,18 +31,18 @@ HTTPD_STATUS="" # MySQL MYSQL_PIDFILE=$INSTALL_PATH/mysql/data/mysqld.pid MYSQL_PID="" -#MYSQL_START="$INSTALL_PATH/mysql/bin/safe_mysqld --port=@@BITROCK_MYSQL_PORT@@ --socket=$INSTALL_PATH/mysql/tmp/mysql.sock --old-passwords --datadir=$INSTALL_PATH/mysql/data --pid-file=$INSTALL_PATH/mysql/data/mysqld.pid" -MYSQL_START="$INSTALL_PATH/mysql/bin/safe_mysqld --port=@@BITROCK_MYSQL_PORT@@ --socket=$INSTALL_PATH/mysql/tmp/mysql.sock --old-passwords --datadir=$INSTALL_PATH/mysql/data --log-error=$INSTALL_PATH/mysql/data/mysqld.log --pid-file=$INSTALL_PATH/mysql/data/mysqld.pid" -MYSQL_STOP="$INSTALL_PATH/mysql/bin/mysqladmin --socket=$INSTALL_PATH/mysql/tmp/mysql.sock -u root -p shutdown" +#MYSQL_START="$INSTALL_PATH/mysql/bin/safe_mysqld --port=3306 --socket=$INSTALL_PATH/mysql/tmp/mysql.sock --old-passwords --datadir=$INSTALL_PATH/mysql/data --pid-file=$INSTALL_PATH/mysql/data/mysqld.pid" +MYSQL_START="$INSTALL_PATH/mysql/bin/safe_mysqld --defaults-file=${INSTALL_PATH}/mysql/my.cnf --old-passwords --datadir=$INSTALL_PATH/mysql/data --log-error=$INSTALL_PATH/mysql/data/mysqld.log --pid-file=$INSTALL_PATH/mysql/data/mysqld.pid" +MYSQL_STOP="$INSTALL_PATH/mysql/bin/mysqladmin --defaults-file=${INSTALL_PATH}/mysql/my.cnf -u root -p shutdown" MYSQL_STATUS="" MYSQL_PASSWORD="" -# Xvfb -XVFB_PIDFILE=$INSTALL_PATH/Xvfb/xvfb.pid -XVFB_PID="" -XVFBBIN=$INSTALL_PATH/Xvfb/bin/Xvfb -XVFB="$XVFBBIN :$VDISPLAY -screen 0 800x600x8 -fbdir $INSTALL_PATH/Xvfb/var/run -fp $INSTALL_PATH/Xvfb/misc" -XVFB_STATUS="" +# Agent +AGENT_PIDFILE="$INSTALL_PATH/updates/agent.pid" +AGENT_PID="" +AGENT="$INSTALL_PATH/updates/agent.bin" +AGENT_STATUS="" +AGENT_BIN=agent.bin # OpenOffice SOFFICE_PATH="$INSTALL_PATH/openoffice/program" @@ -48,17 +50,14 @@ SOFFICE_PIDFILE=$INSTALL_PATH/openoffice/soffice.bin.pid SOFFICE_PID="" SOFFICE_PORT="8100" SOFFICEBIN=$INSTALL_PATH/openoffice/program/soffice.bin -if [ $USEXVFB -eq 1 ]; then - SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -display :$VDISPLAY -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager" -else - SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager" -fi +#SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=pipe,name=pypipe;urp;StarOffice.ServiceManager" +SOFFICE="$SOFFICEBIN -nofirststartwizard -nologo -headless -accept=socket,host=127.0.0.1,port=$SOFFICE_PORT;urp;StarOffice.ServiceManager" SOFFICE_STATUS="" # Lucene LUCENE_PIDFILE=$INSTALL_PATH/knowledgeTree/bin/luceneserver/lucene.pid LUCENE_PID="" -LUCENE="$JAVABIN -jar ktlucene.jar" +LUCENE="$JAVABIN -Xms512M -Xmx512M -jar ktlucene.jar" LUCENE_STATUS="" # Scheduler @@ -92,23 +91,23 @@ get_apache_pid() { fi } -get_mysql_pid() { - get_pid $MYSQL_PIDFILE +get_agent_pid() { + get_pid $AGENT_PIDFILE if [ ! $PID ]; then return fi if [ $PID -gt 0 ]; then - MYSQL_PID=$PID + AGENT_PID=$PID fi } -get_xvfb_pid() { - get_pid $XVFB_PIDFILE +get_mysql_pid() { + get_pid $MYSQL_PIDFILE if [ ! $PID ]; then return fi if [ $PID -gt 0 ]; then - XVFB_PID=$PID + MYSQL_PID=$PID fi } @@ -164,26 +163,26 @@ is_mysql_running() { return $RUNNING } -is_apache_running() { - get_apache_pid - is_service_running $HTTPD_PID +is_agent_running() { + get_agent_pid + is_service_running $AGENT_PID RUNNING=$? if [ $RUNNING -eq 0 ]; then - HTTPD_STATUS="apache not running" + AGENT_STATUS="agent not running" else - HTTPD_STATUS="apache already running" + AGENT_STATUS="agent already running" fi return $RUNNING } -is_xvfb_running() { - get_xvfb_pid - is_service_running $XVFB_PID +is_apache_running() { + get_apache_pid + is_service_running $HTTPD_PID RUNNING=$? if [ $RUNNING -eq 0 ]; then - XVFB_STATUS="Xvfb not running" + HTTPD_STATUS="apache not running" else - XVFB_STATUS="Xvfb already running" + HTTPD_STATUS="apache already running" fi return $RUNNING } @@ -242,7 +241,7 @@ start_mysql() { else $MYSQL_START &> $INSTALL_PATH/var/log/dmsctl.log & if [ $? -eq 0 ]; then - echo "$0 $ARG: mysql started at port @@BITROCK_MYSQL_PORT@@" + echo "$0 $ARG: mysql started at port 3306" sleep 2 else echo "$0 $ARG: mysql could not be started" @@ -276,89 +275,84 @@ stop_mysql() { fi } -start_apache() { - test_apache_config - is_apache_running +start_agent() { + is_agent_running RUNNING=$? - if [ $RUNNING -eq 1 ]; then - echo "$0 $ARG: httpd (pid $HTTPD_PID) already running" + echo "$0 $ARG: agent (pid $AGENT_PID) already running" else - if $HTTPD &> $INSTALL_PATH/var/log/dmsctl.log; then - echo "$0 $ARG: httpd started at port @@BITROCK_APACHE_PORT@@" - else - echo "$0 $ARG: httpd could not be started" - ERROR=3 - fi -fi + $AGENT &> $INSTALL_PATH/var/log/dmsctl.log & + sleep 5 + get_agent_pid + if [ $AGENT_PID -gt 0 ]; then + echo "$0 $ARG: agent started" + else + echo "$0 $ARG: agent could not be started" + ERROR=3 + fi + fi } -stop_apache() { +stop_agent() { NO_EXIT_ON_ERROR=$1 - test_apache_config - is_apache_running + is_agent_running RUNNING=$? if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: $HTTPD_STATUS" + echo "$0 $ARG: $AGENT_STATUS" if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then exit else return fi - fi - get_apache_pid - if kill $HTTPD_PID ; then - echo "$0 $ARG: httpd stopped" - else - echo "$0 $ARG: httpd could not be stopped" - ERROR=4 - fi + fi + get_agent_pid + if kill $AGENT_PID ; then + echo "$0 $ARG: agent stopped" + else + echo "$0 $ARG: agent could not be stopped" + ERROR=4 + fi } -start_xvfb() { -if [ $USEXVFB -eq 1 ]; then - is_xvfb_running +start_apache() { + test_apache_config + is_apache_running RUNNING=$? if [ $RUNNING -eq 1 ]; then - echo "$0 $ARG: Xvfb (pid $XVFB_PID) already running" + echo "$0 $ARG: httpd (pid $HTTPD_PID) already running" else - nohup $XVFB &> $INSTALL_PATH/var/log/dmsctl.log & - if [ $? -eq 0 ]; then - echo "$0 $ARG: Xvfb started on display $VDISPLAY" - ps ax | grep $XVFBBIN | awk {'print $1'} > $XVFB_PIDFILE - sleep 2 + if $HTTPD &> $INSTALL_PATH/var/log/dmsctl.log; then + echo "$0 $ARG: httpd started at port 8080" else - echo "$0 $ARG: xvfb could not be started" + echo "$0 $ARG: httpd could not be started" ERROR=3 fi - fi fi } -stop_xvfb() { -if [ $USEXVFB -eq 1 ]; then +stop_apache() { NO_EXIT_ON_ERROR=$1 - is_xvfb_running + test_apache_config + is_apache_running RUNNING=$? if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: $XVFB_STATUS" + echo "$0 $ARG: $HTTPD_STATUS" if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then exit else return fi fi - get_xvfb_pid - if kill $XVFB_PID ; then - echo "$0 $ARG: Xvfb stopped" + get_apache_pid + if kill $HTTPD_PID ; then + echo "$0 $ARG: httpd stopped" else - echo "$0 $ARG: Xvfb could not be stopped" + echo "$0 $ARG: httpd could not be stopped" ERROR=4 fi -fi } start_soffice() { @@ -368,10 +362,6 @@ start_soffice() { if [ $RUNNING -eq 1 ]; then echo "$0 $ARG: openoffice (pid $SOFFICE_PID) already running" else - if [ $USEXVFB -eq 1 ]; then - start_xvfb - sleep 2 - fi nohup $SOFFICE &> $INSTALL_PATH/var/log/dmsctl.log & if [ $? -eq 0 ]; then echo "$0 $ARG: openoffice started at port $SOFFICE_PORT" @@ -397,9 +387,6 @@ stop_soffice() { return fi fi - if [ $USEXVFB -eq 1 ]; then - stop_xvfb - fi get_soffice_pid if killall $SOFFICEBIN ; then echo "$0 $ARG: openoffice stopped" @@ -446,6 +433,7 @@ stop_lucene() { get_lucene_pid cd $INSTALL_PATH/knowledgeTree/search2/indexing/bin $INSTALL_PATH/php/bin/php shutdown.php positive &> $INSTALL_PATH/var/log/dmsctl.log + sleep 5 if [ $? -eq 0 ]; then echo "$0 $ARG: lucene stopped" else @@ -501,10 +489,10 @@ help() { echo " $0 (start|stop|restart)" echo " $0 (start|stop|restart) apache" echo " $0 (start|stop|restart) mysql" + echo " $0 (start|stop|restart) agent" echo " $0 (start|stop|restart) scheduler" echo " $0 (start|stop|restart) soffice" echo " $0 (start|stop|restart) lucene" - echo " $0 (start|stop|restart) xvfb" cat <