Merge branch 'upstreammaster' into senslab2

[sfa.git] / init.d / sfa

diff --git a/init.d/sfa b/init.d/sfa
index 45b6981..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
@@ -51,7 +57,7 @@ fi
 
 
 postgresql_conf=$PGDATA/postgresql.conf
-pghba_conf=$PGDATA/pg_hba.conf
+pg_hba_conf=$PGDATA/pg_hba.conf
 postgresql_sysconfig=/etc/sysconfig/pgsql
 
 # SFA consolidated (merged) config file
@@ -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
 
@@ -205,22 +211,22 @@ function db_start () {
 
        ######## /var/lib/pgsql/data/pg_hba.conf
        # Disable access to all DBs from all hosts
-       sed -i -e '/^\(host\|local\)/d' $pghba_conf
+       sed -i -e '/^\(host\|local\)/d' $pg_hba_conf
 
        # Enable passwordless localhost access
-       echo "local all all trust" >>$pghba_conf
+       echo "local all all trust" >>$pg_hba_conf
        # grant access
        (
            echo "host $SFA_DB_NAME $SFA_DB_USER 127.0.0.1/32 password"
            [ -n "$registry_ip" ] && echo "host $SFA_DB_NAME $SFA_DB_USER ${registry_ip}/32 password"
-       ) >>$pghba_conf
+       ) >>$pg_hba_conf
 
     if [ "$SFA_GENERIC_FLAVOUR" == "openstack" ] ; then
-        [ -n "$registry_ip" ] && echo "host nova nova ${registry_ip}/32 password" >> $pghba_conf
+        [ -n "$registry_ip" ] && echo "host nova nova ${registry_ip}/32 password" >> $pg_hba_conf
     fi   
        
        # Fix ownership (sed -i changes it)
-       chown postgres:postgres $postgresql_conf $pghba_conf
+       chown postgres:postgres $postgresql_conf $pg_hba_conf
 
        ######## compute a password if needed
        if [ -z "$SFA_DB_PASSWORD" ] ; then
@@ -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"