X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=init.d%2Fsfa;h=18a9b85f0a66da2e6ad44fdc3bc812f9caf4fdd8;hb=352d7f1a8859e00d6d50e126c9e4d67724f09309;hp=7c51b48896d23bd5b5fdea9d3fdc200577486326;hpb=2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331;p=sfa.git

diff --git a/init.d/sfa b/init.d/sfa
index 7c51b488..18a9b85f 100755
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -10,24 +10,22 @@
 
 # source function library
 . /etc/init.d/functions
-
 # Default locations
 PGDATA=/var/lib/pgsql/data
 postgresql_conf=$PGDATA/postgresql.conf
 pghba_conf=$PGDATA/pg_hba.conf
 postgresql_sysconfig=/etc/sysconfig/pgsql
 
-# PLC consolidated (merged) config file
-plc_whole_config=/etc/planetlab/plc_config.xml
 # SFA consolidated (merged) config file
-sfa_whole_config=/etc/sfa/sfa_config.xml
+sfa_whole_config=/etc/sfa/sfa_config
 # SFA default config (read-only template)
 sfa_default_config=/etc/sfa/default_config.xml
 # SFA local (site-dependent) file
-sfa_local_config=/etc/sfa/configs/site.xml
+sfa_local_config=/etc/sfa/configs/site_config
+sfa_local_config_xml=/etc/sfa/configs/site_config.xml
 
 # Source sfa shell config if present 
-[ -f /etc/sfa/sfa_config ] && . /etc/sfa/sfa_config
+[ -f /etc/sfa/sfa_config.sh ] && . /etc/sfa/sfa_config.sh
 
 # Export so that we do not have to specify -p to psql invocations
 export PGPORT=$SFA_DB_PORT
@@ -82,8 +80,8 @@ function reload () {
     files=( $sfa_default_config $sfa_local_config )
     for file in "${files[@]}" ; do
 	if [ -n "$force" -o $file -nt $sfa_whole_config ] ; then
-	    tmp=$(mktemp /tmp/sfa_config.xml.XXXXXX)
-	    plc-config --xml "${files[@]}" >$tmp
+	    tmp=$(mktemp /tmp/sfa_config.XXXXXX)
+	    sfa-config --python "${files[@]}" >$tmp
 	    if [ $? -eq 0 ] ; then
 		mv $tmp $sfa_whole_config
 		chmod 444 $sfa_whole_config
@@ -96,11 +94,15 @@ function reload () {
     done
 
     # Convert configuration to various formats
-    if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/sfa_config ] ; then
-	plc-config --shell $sfa_whole_config > /etc/sfa/sfa_config
+    if [ -f $sfa_local_config_xml ] ; then
+    sfa-config --python $sfa_local_config_xml > $sfa_local_config 
+    rm $sfa_local_config_xml 
+    fi
+    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.py ] ; then
-	plc-config --python $sfa_whole_config > /etc/sfa/sfa_config.py
+    if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/sfa_config.sh ] ; then
+	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
@@ -115,7 +117,7 @@ function reload () {
     #gen-sfa-cm-config.py        
 
     # reload the shell version
-    [ -f /etc/sfa/sfa_config ] && . /etc/sfa/sfa_config
+    [ -f /etc/sfa/sfa_config.sh ] && . /etc/sfa/sfa_config.sh
 
 }
 
@@ -123,88 +125,91 @@ 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
 
-	######## standalone deployment - no colocated myplc
-
-	######## sysconfig 
-	# Set data directory and redirect startup output to /var/log/pgsql
-	mkdir -p $(dirname $postgresql_sysconfig)
-	# remove previous definitions
-	touch $postgresql_sysconfig
-	tmp=${postgresql_sysconfig}.new
-	( egrep -v '^(PGDATA=|PGLOG=|PGPORT=)' $postgresql_sysconfig 
-	    echo "PGDATA=$PGDATA"
-	    echo "PGLOG=/var/log/pgsql"
-	    echo "PGPORT=$SFA_DB_PORT"
-	) >> $tmp ; mv -f $tmp $postgresql_sysconfig
-
-	######## /var/lib/pgsql/data 
-	# Fix ownership (rpm installation may have changed it)
-	chown -R -H postgres:postgres $(dirname $PGDATA)
-
-	# PostgreSQL must be started at least once to bootstrap
-	# /var/lib/pgsql/data
-	if [ ! -f $postgresql_conf ] ; then
-	    service postgresql initdb &> /dev/null || :
-	    check
-	fi
+        ######## standalone deployment - no colocated myplc
+
+        ######## sysconfig 
+        # Set data directory and redirect startup output to /var/log/pgsql
+        mkdir -p $(dirname $postgresql_sysconfig)
+        # remove previous definitions
+        touch $postgresql_sysconfig
+        tmp=${postgresql_sysconfig}.new
+        ( egrep -v '^(PGDATA=|PGLOG=|PGPORT=)' $postgresql_sysconfig 
+            echo "PGDATA=$PGDATA"
+            echo "PGLOG=/var/log/pgsql"
+            echo "PGPORT=$SFA_DB_PORT"
+        ) >> $tmp ; mv -f $tmp $postgresql_sysconfig
+
+        ######## /var/lib/pgsql/data 
+        # Fix ownership (rpm installation may have changed it)
+        chown -R -H postgres:postgres $(dirname $PGDATA)
+
+        # PostgreSQL must be started at least once to bootstrap
+        # /var/lib/pgsql/data
+        if [ ! -f $postgresql_conf ] ; then
+            service postgresql initdb &> /dev/null || :
+            check
+        fi
+
+        ######## /var/lib/pgsql/data/postgresql.conf
+        registry_ip=""
+        foo=$(python -c "import socket; print socket.gethostbyname(\"$SFA_REGISTRY_HOST\")") && registry_ip="$foo"
+        # Enable DB server. drop Postgresql<=7.x
+        # PostgreSQL >=8.0 defines listen_addresses
+        # listen on a specific IP + localhost, more robust when run within a vserver
+        sed -i -e '/^listen_addresses/d' $postgresql_conf
+        if [ -z "$registry_ip" ] ; then
+            echo "listen_addresses = 'localhost'" >> $postgresql_conf
+        else
+            echo "listen_addresses = '${registry_ip},localhost'" >> $postgresql_conf
+        fi
+        # tweak timezone to be 'UTC'
+        sed -i -e '/^timezone=/d' $postgresql_conf
+        echo "timezone='UTC'" >> $postgresql_conf
+
+        ######## /var/lib/pgsql/data/pg_hba.conf
+        # Disable access to all DBs from all hosts
+        sed -i -e '/^\(host\|local\)/d' $pghba_conf
+
+        # Enable passwordless localhost access
+        echo "local all all trust" >>$pghba_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
+
+        if [ "$SFA_GENERIC_FLAVOUR" == "openstack" ] ; then
+            [ -n "$registry_ip" ] && echo "host nova nova ${registry_ip}/32 password" >> $pghba_conf
+        fi   
+        
+        # Fix ownership (sed -i changes it)
+        chown postgres:postgres $postgresql_conf $pghba_conf
 
-	######## /var/lib/pgsql/data/postgresql.conf
-	registry_ip=""
-	foo=$(python -c "import socket; print socket.gethostbyname(\"$SFA_REGISTRY_HOST\")") && registry_ip="$foo"
-	# Enable DB server. drop Postgresql<=7.x
-	# PostgreSQL >=8.0 defines listen_addresses
-	# listen on a specific IP + localhost, more robust when run within a vserver
-	sed -i -e '/^listen_addresses/d' $postgresql_conf
-	if [ -z "$registry_ip" ] ; then
-	    echo "listen_addresses = 'localhost'" >> $postgresql_conf
-	else
-	    echo "listen_addresses = '${registry_ip},localhost'" >> $postgresql_conf
-	fi
-	# tweak timezone to be 'UTC'
-	sed -i -e '/^timezone=/d' $postgresql_conf
-	echo "timezone='UTC'" >> $postgresql_conf
-
-	######## /var/lib/pgsql/data/pg_hba.conf
-	# Disable access to all DBs from all hosts
-	sed -i -e '/^\(host\|local\)/d' $pghba_conf
-
-	# Enable passwordless localhost access
-	echo "local all all trust" >>$pghba_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
-
-    if [ "$SFA_GENERIC_FLAVOUR" == "openstack" ] ; then
-        [ -n "$registry_ip" ] && echo "host nova nova ${registry_ip}/32 password" >> $pghba_conf
-    fi   
-	
-	# Fix ownership (sed -i changes it)
-	chown postgres:postgres $postgresql_conf $pghba_conf
-
-	######## compute a password if needed
-	if [ -z "$SFA_DB_PASSWORD" ] ; then
-	    SFA_DB_PASSWORD=$(uuidgen)
-	    plc-config --category=sfa_db --variable=password --value="$SFA_DB_PASSWORD" --save=$sfa_local_config $sfa_local_config >& /dev/null
-	    reload force
-	fi
+        ######## compute a password if needed
+        if [ -z "$SFA_DB_PASSWORD" ] ; then
+            SFA_DB_PASSWORD=$(uuidgen)
+            sfa-config --category=sfa_db --variable=password --value="$SFA_DB_PASSWORD" --save=$sfa_local_config $sfa_local_config >& /dev/null
+            reload force
+        fi
 
     else
 
         ######## we are colocated with a myplc
-	# no need to worry about the pgsql setup (see /etc/plc.d/postgresql)
-	# myplc enforces the password for its user
-	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 
-	plc-config --category=sfa_db --variable=user --value=$PLC_DB_USER --save=$sfa_local_config $sfa_local_config >& /dev/null
-	plc-config --category=sfa_db --variable=password --value=$PLC_DB_PASSWORD --save=$sfa_local_config $sfa_local_config >& /dev/null
-	reload force
+        # no need to worry about the pgsql setup (see /etc/plc.d/postgresql)
+        # myplc enforces the password for its user
+        
+        # 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)
+        # 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
 
     ######## Start up the server
@@ -231,8 +236,9 @@ function db_start () {
 	check
     fi
     check
+    sfaadmin reg sync_db
 
-    MESSAGE=$"Checking for PostgreSQL server"
+    MESSAGE=$"SFA: Checking for PostgreSQL server"
     echo -n "$MESSAGE"
     [ "$ERRORS" == 0 ] && success "$MESSAGE" || failure "$MESSAGE" ; echo
 }
@@ -241,7 +247,7 @@ function db_start () {
 function db_stop () {
 
     # only if enabled
-    [ "$SFA_DB_ENABLED" == 1 ] || return
+    [ "$SFA_DB_ENABLED" == 1 -o "$SFA_DB_ENABLED" == True ] || return
 
     # not too nice, but.. when co-located with myplc we'll let it start/stop postgresql
     if ! rpm -q myplc >& /dev/null ; then
@@ -261,13 +267,13 @@ function start() {
     # migrations are now handled in the code by sfa.storage.dbschema
 
     # install peer certs
-    action $"SFA installing peer certs" daemon /usr/bin/sfa-start.py -t -d $OPTIONS 
+    action $"SFA: installing peer certs" daemon /usr/bin/sfa-start.py -t -d $OPTIONS 
 
-    [ "$SFA_REGISTRY_ENABLED" == 1 ] && action $"SFA Registry" daemon /usr/bin/sfa-start.py -r -d $OPTIONS
+    [ "$SFA_REGISTRY_ENABLED" == 1 -o "$SFA_REGISTRY_ENABLED" == True ] && action $"SFA: Registry" daemon /usr/bin/sfa-start.py -r -d $OPTIONS
     
-    [ "$SFA_AGGREGATE_ENABLED" == 1 ] && action $"SFA Aggregate" daemon /usr/bin/sfa-start.py -a -d $OPTIONS
+    [ "$SFA_AGGREGATE_ENABLED" == 1  -o "$SFA_AGGREGATE_ENABLED" == True ] && action $"SFA: Aggregate" daemon /usr/bin/sfa-start.py -a -d $OPTIONS
         
-    [ "$SFA_SM_ENABLED" == 1 ] && action "SFA SliceMgr" daemon /usr/bin/sfa-start.py -s -d $OPTIONS
+    [ "$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 ] && \
         action "Flash Policy Server" daemon /usr/bin/sfa_flashpolicy.py --file="$SFA_FLASHPOLICY_CONFIG_FILE" --port=$SFA_FLASHPOLICY_PORT -d