expose PL node tags using attribute in PGv2 and GENIv3 rspecs

[sfa.git] / init.d / sfa

diff --git a/init.d/sfa b/init.d/sfa
index 08e6893..0ba2385 100755 (executable)
--- 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
@@ -315,7 +315,7 @@ function start() {
         
     [ "$SFA_SM_ENABLED" == 1 -o "$SFA_SM_ENABLED" == True ] && action "SFA: SliceMgr" daemon /usr/bin/sfa-start.py -s -d $OPTIONS
 
-    [ "$SFA_FLASHPOLICY_ENABLED" == 1 ] && \
+    [ "$SFA_FLASHPOLICY_ENABLED" == 1 -o "$SFA_FLASHPOLICY_ENABLED" == True ] && \
         action "Flash Policy Server" daemon /usr/bin/sfa_flashpolicy.py --file="$SFA_FLASHPOLICY_CONFIG_FILE" --port=$SFA_FLASHPOLICY_PORT -d
 
     touch $SFALOCK
@@ -361,4 +361,3 @@ case "$1" in
 esac
 
 exit $RETVAL
-