X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=b627c17b457929b65b54fc49ba85e8be8b17e154;hb=ca65ff1cd55b2a285320ec8562e8ca1e29fbc4f0;hp=3fb17283321a8ba29c47555692d185aef91e8f63;hpb=21f8190281cfb38c3e24dfba6c89420830435f1f;p=monitor.git

diff --git a/monitor-server.init b/monitor-server.init
index 3fb1728..b627c17 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -77,7 +77,7 @@ function check_user_and_db()
     fi
 
     # Create/update the unprivileged database user and password
-    if [ -z "$PLC_MONITOR_DBPASSWORD" || "$PLC_MONITOR_DBPASSWORD" = "None" ] ; then
+    if [[ -z "$PLC_MONITOR_DBPASSWORD" || "$PLC_MONITOR_DBPASSWORD" = "None" ]] ; then
         # Zabbix doesn't like plain uuidgen passwords
         PLC_MONITOR_DBPASSWORD=$( uuidgen | md5sum - | awk '{print $1}' )
         plc-config --category=plc_monitor --variable=dbpassword --value="$PLC_MONITOR_DBPASSWORD" --save=$local_config $local_config
@@ -219,6 +219,7 @@ cachetime=60
 # Evaluated as true or false
 [commandline]
 cachecalls=True
+embedded=False
 
 echo=False
 debug=False
@@ -276,6 +277,7 @@ EOF
 
 function start_tg_server ()
 {
+	stop_tg_server
 	pushd ${MONITORPATH}/web/MonitorWeb/
 	./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log &
 	popd
@@ -412,7 +414,8 @@ case "$1" in
 		# turn off zabbix server, etc. before writing to the db.
 		service plc stop monitor 
 
-		$MONITORPATH/zabbix/zabbixsync.py --setupglobal &> /var/log/monitor-server
+		$MONITORPATH/zabbix/zabbixsync.py --setupids &> /var/log/monitor-server
+		$MONITORPATH/zabbix/zabbixsync.py --setupglobal 2>&1 >> /var/log/monitor-server
 		# import any templates
 		check_zabbix_templates_and_import
 
@@ -421,6 +424,19 @@ case "$1" in
 		result "$MESSAGE"
 	;;
 
+	delete)
+		MESSAGE=$"Deleting databases..."
+		dialog "$MESSAGE"
+
+		dropdb -U postgres $ZABBIX_DB_NAME
+		dropuser -U postgres $ZABBIX_DB_USER
+
+		dropdb -U postgres $MONITOR_DB_NAME
+		dropuser -U postgres $MONITOR_DB_USER
+
+		result "$MESSAGE"
+	;;
+
 	stop)
 		MESSAGE=$"Stopping Monitor"
 		dialog "$MESSAGE"