X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=automate-default.sh;fp=automate-default.sh;h=8e7be9c5402921c91377e599ca332a1c6c807159;hb=5ff2eaddf7644ac7ffddfe536ba9e50aa7529273;hp=1aaeb59f59e9bfae32cc9346d78049e6d4909769;hpb=a03201adf84a720dcf1b527465d0fc93d3841bc7;p=monitor.git

diff --git a/automate-default.sh b/automate-default.sh
index 1aaeb59..8e7be9c 100755
--- a/automate-default.sh
+++ b/automate-default.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
 # NOTE: Must be an absolute path to guarantee it is read.
-source /usr/share/monitor-server/monitorconfig.py
+INSTALLPATH=/usr/share/monitor-server/
+# Generate an 'sh' style file full of variables in monitor.conf
+$INSTALLPATH/shconfig.py >  $INSTALLPATH/monitorconfig.sh
+source $INSTALLPATH/monitorconfig.sh
 cd ${MONITOR_SCRIPT_ROOT}
 set -e
 DATE=`date +%Y-%m-%d-%T`
@@ -29,6 +32,15 @@ if [ -f $MONITOR_PID ] ; then
 fi
 echo $$ > $MONITOR_PID
 
+# SETUP act_all database if it's not there.
+if [ ! -f ${MONITOR_SCRIPT_ROOT}/actallsetup.flag ]; then
+	if ! python -c 'import database; database.dbLoad("act_all")' 2>/dev/null ; then 
+		python -c 'import database; database.dbDump("act_all", {})' 2>/dev/null ; then 
+		touch ${MONITOR_SCRIPT_ROOT}/actallsetup.flag
+	fi
+fi
+
+
 AGENT=`ps ax | grep ssh-agent | grep -v grep`
 if [ -z "$AGENT" ] ; then
         echo "starting ssh agent"