rename into less confusing pg_hba_conf
Thierry Parmentelat [Tue, 22 Jan 2013 08:44:15 +0000 (09:44 +0100)]
init.d/sfa

index 45b6981..bde199d 100755 (executable)
@@ -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