From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 16 Jul 2012 16:19:26 +0000 (-0400)
Subject: fix type bugs
X-Git-Tag: sfa-2.1-14~112
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0e705b428a94f662b8b7aef2f90792a2ab18e63e;p=sfa.git

fix type bugs
---

diff --git a/init.d/sfa b/init.d/sfa
index 5e2c9c2d..80b5da3b 100755
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -10,8 +10,8 @@
 
 # source function library
 . /etc/init.d/functions
-
 # Default locations
+set -x
 PGDATA=/var/lib/pgsql/data
 postgresql_conf=$PGDATA/postgresql.conf
 pghba_conf=$PGDATA/pg_hba.conf
@@ -94,11 +94,11 @@ function reload () {
     done
 
     # Convert configuration to various formats
-    if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/sfa_config ] ; then
-	sfa-config --python $sfa_whole_config > /etc/sfa/sfa_config
+    if [ -n "$force" -o $sfa_local_config -nt $sfa_whole_config ] ; then
+	sfa-config --python $sfa_default_config $sfa_local_config > $sfa_whole_config
     fi
     if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/sfa_config.sh ] ; then
-	sfa-config --shell $sfa_whole_config > /etc/sfa/sfa_config.sh
+	sfa-config --shell $sfa_default_config $sfa_local_config > /etc/sfa/sfa_config.sh
     fi
 #    if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/php/sfa_config.php ] ; then
 #	mkdir -p /etc/sfa/php
@@ -121,7 +121,7 @@ function reload () {
 function db_start () {
     
     # only if enabled
-    [ "$SFA_DB_ENABLED" == 1 ] || return
+    [ "$SFA_DB_ENABLED" == 1 -o "$SFA_DB_ENABLED" == true ] || return
 
     if ! rpm -q myplc >& /dev/null; then