From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sat, 1 Dec 2012 00:42:52 +0000 (-0500)
Subject: revert last change
X-Git-Tag: sfa-3.0-0~79
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=352d7f1a8859e00d6d50e126c9e4d67724f09309;p=sfa.git

revert last change
---

diff --git a/init.d/sfa b/init.d/sfa
index 334215ff..18a9b85f 100755
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -196,7 +196,7 @@ function db_start () {
             reload force
         fi
 
-    #else
+    else
 
         ######## we are colocated with a myplc
         # no need to worry about the pgsql setup (see /etc/plc.d/postgresql)
@@ -204,13 +204,13 @@ function db_start () {
         
         # The code below overwrites the site specific sfa db info with myplc db info. 
         # This is most likely unncecessary and wrong so I'm commenting it out for now.  
-        #PLC_DB_USER=$(plc-config --category=plc_db --variable=user)
-        #PLC_DB_PASSWORD=$(plc-config --category=plc_db --variable=password)
+        PLC_DB_USER=$(plc-config --category=plc_db --variable=user)
+        PLC_DB_PASSWORD=$(plc-config --category=plc_db --variable=password)
         # store this as the SFA user/password 
-        #sfa-config --category=sfa_db --variable=user --value=$PLC_DB_USER --save=$sfa_local_config $sfa_local_config >& /dev/null
-        #sfa-config --category=sfa_db --variable=password --value=$PLC_DB_PASSWORD --save=$sfa_local_config $sfa_local_config >& /dev/null
-        #reload force
-    #fi
+        sfa-config --category=sfa_db --variable=user --value=$PLC_DB_USER --save=$sfa_local_config $sfa_local_config >& /dev/null
+        sfa-config --category=sfa_db --variable=password --value=$PLC_DB_PASSWORD --save=$sfa_local_config $sfa_local_config >& /dev/null
+        reload force
+    fi
 
     ######## Start up the server
     # not too nice, but.. when co-located with myplc we'll let it start/stop postgresql