X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=8c26416f62370a59416e96fb9cba1c51d143d090;hb=59a3193348d8981ba5a648915c1517ad7d1d5911;hp=ee7c469b99d7e33a86b9e8c698c167aad1db1159;hpb=ce9101bfa7720c131a982220f2905e4439b324fc;p=monitor.git

diff --git a/monitor-server.init b/monitor-server.init
index ee7c469..8c26416 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -44,6 +44,7 @@ function check_monitor_schema_and_data()
 {
 	# NOTE: call create_all() to setup the database from the info model.
 	python -c "from monitor.database.info.model import *; from elixir import create_all; create_all()"
+	$MONITORPATH/init-bootman-sequence.py
 }
 
 function check_monitor_conf ()
@@ -61,21 +62,16 @@ EOF
 	if [ ! -f ${MONITOR_CONFIG} ] ; then
 		cat <<EOF > ${MONITOR_CONFIG}
 [monitorconfig]
-RT_DB_HOST=rt.planet-lab.org
-RT_DB_USER=
-RT_DB_PASSWORD=
-RT_DB_NAME=
-
 # RT Web user account
-RT_WEB_SERVER=https://rt.planet-lab.org/
-RT_WEB_TOOLS_PATH=
-RT_WEB_USER=
-RT_WEB_PASSWORD=
+RT_WEB_SERVER=http://${PLC_RT_HOST}/
+RT_WEB_TOOLS_PATH=/usr/bin/
+RT_WEB_USER=${PLC_RT_WEB_USER}
+RT_WEB_PASSWORD=${PLC_RT_WEB_PASSWORD}
 RT_WEB_DEBUG=0
-RT_QUEUE=
+RT_QUEUE=${PLC_MONITOR_RT_QUEUE}
 
 # PLC admin account
-API_SERVER=https://${PLC_BOOT_HOST}/PLCAPI/
+API_SERVER=https://${PLC_API_HOST}:${PLC_API_PORT}/PLCAPI/
 API_AUTH_USER=${PLC_MONITOR_EMAIL}
 API_AUTH_PASSWORD=${PLC_MONITOR_DBPASSWORD}
 
@@ -92,16 +88,19 @@ PLC_WWW_HOSTNAME=${PLC_WWW_HOST}
 PLC_NAME=${PLC_NAME}
 
 # used for debug mode
-email=
-
+email=${PLC_MONITOR_CC_EMAIL}
 # all messages will appear to be from this address
 from_email=${PLC_MONITOR_EMAIL}
-
 # a separate address for support messages
 support_email=${PLC_MAIL_SUPPORT_ADDRESS}
-
 # mailing list copied on all out-going messages
-cc_email=
+cc_email=${PLC_MONITOR_CC_EMAIL}
+
+# these are reserved values
+RT_DB_HOST=${PLC_RT_HOST}
+RT_DB_USER=
+RT_DB_PASSWORD=
+RT_DB_NAME=
 
 [monitordatabase]
 monitor_dburi=postgres://${MONITOR_DB_USER}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${MONITOR_DB_NAME}
@@ -113,6 +112,7 @@ cachetime=60
 [commandline]
 cachecalls=True
 embedded=False
+zabbix_enabled=False
 
 echo=False
 debug=False
@@ -172,6 +172,8 @@ function start_tg_server ()
 {
 	stop_tg_server
 	pushd ${MONITORPATH}/web/MonitorWeb/
+	mkdir -p /var/log/monitor/monitorweb/
+	cp /var/log/monitorweb.log /var/lib/monitor/monitorweb/`date +%Y-%m-%d-%H-%M`-monitorweb.log
 	./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log &
 	popd
 }