From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Thu, 4 Apr 2013 10:22:03 +0000 (+0200)
Subject: fix sfa initscript
X-Git-Tag: sfa-3.0-1~90
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=673a4ec4f3625986ff3482ee3104e1e4dfb1a574;p=sfa.git

fix sfa initscript
---

diff --git a/init.d/sfa b/init.d/sfa
index 08e6893e..db1708f7 100755
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -211,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