X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=init.d%2Fsfa;h=c6b76f2f0824d6a05c43d5638c0e0e30109a02f9;hb=5310688934eb634ac0a6c3c2f5a9e616dcd1899e;hp=a3cd5447241ca2a8788290cbebee1ba99d2cf30a;hpb=45f5ad180c84c1462cfc5e3c8574318e2d121b2d;p=sfa.git

diff --git a/init.d/sfa b/init.d/sfa
index a3cd5447..c6b76f2f 100755
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -59,6 +59,50 @@ function postgresql_check () {
     return 1
 }
 
+# use a single date of this script invocation for the dump_*_db functions.
+DATE=$(date +"%Y-%m-%d-%H-%M-%S")
+
+# Dumps the database - optional argument to specify filename suffix
+function dump_sfa_db()
+{
+    if [ -n "$1" ] ; then suffix="-$1" ; else suffix="" ; fi
+    dumpfile=/var/lib/pgsql/backups/$(date +"${SFA_DB_NAME}.${DATE}${suffix}.sql")
+    pg_dump -U $SFA_DB_USER $SFA_DB_NAME > $dumpfile
+    check
+}
+
+# Updates the database by applying all migration scripts in
+# /usr/share/sfa/migrations/N-up-*, where N is greater than the
+# current subversion. At least one of the migration scripts with the
+# same N must update sfa_db_version.subversion.
+function migrate_db()
+{
+    subversion=$(psql -U $SFA_DB_USER --quiet --tuples-only --no-align -c \
+	         "SELECT subversion FROM sfa_db_version LIMIT 1" \
+	         $SFA_DB_NAME 2>/dev/null || echo 0)
+    shopt -s nullglob
+    for file in /usr/share/sfa/migrations/[0-9]*-up-* ; do
+	script=$(basename $file)
+	index=${script%-up*}
+	extension=${script##*.}
+	if [ $index -gt $subversion ] ; then
+	    if [ "$extension" = "sql" ] ; then
+	        dialog " - $script (dbdumped)"
+	        dump_sfa_db "before-$script"
+		psql -U $SFA_DB_USER -f $file $SFA_DB_NAME
+	    elif [ -x $file ] ; then
+	        dialog " - $script (dbdumped)"
+	        dump_sfa_db "before-$script"
+		$file
+	    else
+	        dialog "\nWarning: migration $file not executable"
+	    fi
+	    check
+	fi
+    done
+}
+
+
 
 # Regenerate configuration files - almost verbatim from plc.init
 function reload () {
@@ -85,10 +129,10 @@ function reload () {
 
     # 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
+	plc-config --shell $sfa_whole_config > /etc/sfa/sfa_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
+	plc-config --python $sfa_whole_config > /etc/sfa/sfa_config.py
     fi
 #    if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/php/sfa_config.php ] ; then
 #	mkdir -p /etc/sfa/php
@@ -101,6 +145,10 @@ function reload () {
     # (or there is no myplc at all) this should be turned off
     # as the component manager is not operational yet we skip this for now
     #gen-sfa-cm-config.py        
+
+    # reload the shell version
+    [ -f /etc/sfa/sfa_config ] && . /etc/sfa/sfa_config
+
 }
 
 ### initialize DB (don't chkconfig postgresql on)
@@ -122,7 +170,7 @@ function db_start () {
 	( egrep -v '^(PGDATA=|PGLOG=|PGPORT=)' $postgresql_sysconfig 
 	    echo "PGDATA=$PGDATA"
 	    echo "PGLOG=/var/log/pgsql"
-	    echo "PGPORT=$PLC_DB_PORT"
+	    echo "PGPORT=$SFA_DB_PORT"
 	) >> $tmp ; mv -f $tmp $postgresql_sysconfig
 
 	######## /var/lib/pgsql/data 
@@ -209,7 +257,7 @@ function db_start () {
     if ! psql -U $SFA_DB_USER -c "" $SFA_DB_NAME >/dev/null 2>&1 ; then
 	createdb -U postgres --template=template0 --encoding=UNICODE --owner=$SFA_DB_USER $SFA_DB_NAME
 	check
-        # xxx in case we'd like to ship the db schema separately
+        # install db schema
         psql -U $SFA_DB_USER -f /usr/share/sfa/sfa.sql $SFA_DB_NAME
 	check
     fi