From b70293aec8a2d175ae52691dd0222d39240f52de Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 22 Jan 2013 09:44:15 +0100
Subject: [PATCH] rename into less confusing pg_hba_conf

---
 init.d/sfa | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/init.d/sfa b/init.d/sfa
index 45b6981a..bde199de 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
@@ -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
-- 
2.47.0