Merge branch 'upstreammaster' into senslab2

[sfa.git] / init.d / sfa

diff --git a/init.d/sfa b/init.d/sfa
index bde199d..4815e37 100755 (executable)
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -6,8 +6,14 @@
 # hopefully right after plc
 # chkconfig: 2345 61 39
 #
-# description:   An implementation  of the SFA Architecture
-#
+### BEGIN INIT INFO
+# Provides:            sfa
+# Required-Start:      postgresql 
+# Required-Stop:       postgresql 
+# Default-Start:       2 3 4 5
+# Default-Stop:                0 1 6
+# Short-Description:   An implementation  of the SFA Architecture
+### END INIT INFO
 
 ####################
 # borrowed from postgresql
@@ -160,7 +166,7 @@ function db_start () {
     # only if enabled
     [ "$SFA_DB_ENABLED" == 1 -o "$SFA_DB_ENABLED" == True ] || return
 
-    if ! rpm -q myplc >& /dev/null; then
+    if [ ! -f /etc/myplc-release ] ; then
 
        ######## standalone deployment - no colocated myplc
 
@@ -266,7 +272,7 @@ function db_start () {
        check
     fi
     check
-    # mention sfaadmin.py instead of just sfaadmin for people who do not install through rpm
+    # mention sfaadmin.py instead of just sfaadmin for safety
     sfaadmin.py reg sync_db
 
     MESSAGE=$"SFA: Checking for PostgreSQL server"
@@ -281,7 +287,7 @@ function db_stop () {
     [ "$SFA_DB_ENABLED" == 1 -o "$SFA_DB_ENABLED" == True ] || return
 
     # not too nice, but.. when co-located with myplc we'll let it start/stop postgresql
-    if ! rpm -q myplc >& /dev/null ; then
+    if [ ! -f /etc/myplc-release ] ; then
        service postgresql stop >& /dev/null
        check
        MESSAGE=$"Stopping PostgreSQL server"