X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=init.d%2Fsfa;h=ac77312826c6ecfe36aecda13288b5619844b778;hb=e07e8e3fe7c447ceacbbf7cd22eba8ae24eb8b1c;hp=bde199de4f97390943c091ffe087786e37437222;hpb=b70293aec8a2d175ae52691dd0222d39240f52de;p=sfa.git diff --git a/init.d/sfa b/init.d/sfa index bde199de..ac773128 100755 --- a/init.d/sfa +++ b/init.d/sfa @@ -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 @@ -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"