Update init scripts to make sure apache2-websockets restart with apache2

Signed-off-by: Andy Witter <awitter@georgialibraries.org>

diff --git a/templates/init/eg_opensrf b/templates/init/eg_opensrf
index 3cb8f5c..e4f4202 100755 (executable)
--- a/templates/init/eg_opensrf
+++ b/templates/init/eg_opensrf
@@ -1,7 +1,11 @@
 #!/bin/bash
+#TODO: properly attribute the original authors of this file
+#TODO: add a 'status' command
+#TODO: create an upstart job instead?
+
 ### BEGIN INIT INFO
 # Provides:          opensrf
-# Required-Start:    $local_fs $remote_fs $network $syslog apache2
+# Required-Start:    $local_fs $remote_fs $network $syslog
 # Required-Stop:     $local_fs $remote_fs $network $syslog 
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
@@ -31,34 +35,49 @@ fi;
 start_opensrf() {
         sleep 3
        log_daemon_msg "Starting Evergreen OpenSRF:"
-       su - opensrf -c /bin/bash -c "PERL5LIB=${PERL5LIB}:${OPENILS_BASE}/lib/perl5 PATH=${PATH}:${OPENILS_BASE}/bin osrf_ctl.sh  -a start_all"
+       su - opensrf -c /bin/bash -c "PERL5LIB=${PERL5LIB}:${OPENILS_BASE}/lib/perl5 PATH=${PATH}:${OPENILS_BASE}/bin osrf_control --start-all"
+       if [ ! -e ${OPENILS_BASE}/var/web/eg_cache_hash ]
+       then
+               if dpkg -l | grep "evergreen-ils" | grep "ii"
+                       then
+                       log_daemon_msg "Running Autogen...:"
+                       su - opensrf /bin/bash -c "PERL5LIB=${PERL5LIB}:${OPENILS_BASE}/lib/perl5 PATH=${PATH}:${OPENILS_BASE}/bin autogen.sh -u"
+               fi
+       fi
 }
 
 stop_opensrf() {
        log_daemon_msg "Stopping Evergreen OpenSRF:"
-       su - opensrf -c /bin/bash -c "PERL5LIB=${PERL5LIB}:${OPENILS_BASE}/lib/perl5 PATH=${PATH}:${OPENILS_BASE}/bin osrf_ctl.sh  -a stop_all"
+       su - opensrf -c /bin/bash -c "PERL5LIB=${PERL5LIB}:${OPENILS_BASE}/lib/perl5 PATH=${PATH}:${OPENILS_BASE}/bin osrf_control --stop-all"
        sleep 3
-       rm $PIDFILES/*.pid
+       rm -f $PIDFILES/*.pid
 }
 
 autogen() {
         echo "Running Autogen Update"
-        sudo -u opensrf /bin/bash -c "PERL5LIB=${PERL5LIB}:${OPENILS_BASE}/lib/perl5 PATH=${PATH}:${OPENILS_BASE}/bin autogen.sh -u -c ${OPENILS_CORE}"
+        su - opensrf /bin/bash -c "PERL5LIB=${PERL5LIB}:${OPENILS_BASE}/lib/perl5 PATH=${PATH}:${OPENILS_BASE}/bin autogen.sh -u"
 }
 
 
 case "$1" in
     start)
         start_opensrf
+       /etc/init.d/apache2-websockets stop
+       /etc/init.d/apache2 restart
+       /etc/init.d/apache2-websockets start
     ;;
     stop)
         stop_opensrf
     ;;
     restart)
+       /etc/init.d/apache2-websockets stop
+       /etc/init.d/apache2 stop
        log_daemon_msg "Restarting Evergreen OpenSRF:"
         stop_opensrf
        sleep 2
         start_opensrf
+       /etc/init.d/apache2-websockets start
+       /etc/init.d/apache2 start
     ;;
     autogen)
         autogen