X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=init.d%2Fsfa;h=ac77312826c6ecfe36aecda13288b5619844b778;hb=e07e8e3fe7c447ceacbbf7cd22eba8ae24eb8b1c;hp=d5b0bb452b5ad0e8cf10564e77a18d24e7d5d223;hpb=4829cca29e865ae2d56a6196cc5684bba76efaf0;p=sfa.git

diff --git a/init.d/sfa b/init.d/sfa
index d5b0bb45..ac773128 100755
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -51,7 +51,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 +160,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 +205,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
@@ -244,7 +244,7 @@ function db_start () {
 
     ######## Start up the server
     # 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
 	echo STARTING...
 	service postgresql start >& /dev/null
     fi
@@ -266,7 +266,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 +281,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"