X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=12193da29c6f1dd695a88c096cc2712c0de1036e;hb=6a452e8ece2ca8a47105c128eaebc38507bc76c5;hp=a194ebea83f43605cc2848f41b5d14ca6e1b561f;hpb=6ab1e756a6267bee392984e1ce26332b4ef66b79;p=monitor.git

diff --git a/monitor-server.init b/monitor-server.init
index a194ebe..12193da 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -277,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
@@ -363,8 +364,8 @@ case "$1" in
 		check_monitor_conf
 		check_monitor_schema_and_data
 
-		check_pg_hba $ZABBIX_DB_NAME $ZABBIX_DB_USER
-		check_user_and_db $ZABBIX_DB_NAME $ZABBIX_DB_USER
+		#check_pg_hba $ZABBIX_DB_NAME $ZABBIX_DB_USER
+		#check_user_and_db $ZABBIX_DB_NAME $ZABBIX_DB_USER
 
 		if [ -n "$WROTE_PG_CONFIG" ] ; then
 			# NOTE: restart db to enable access by users granted above.
@@ -374,8 +375,8 @@ case "$1" in
 			dialog "$MESSAGE"
 		fi
 
-		check_zabbix_schema_and_data
-		check_zabbix_templates_and_import
+		#check_zabbix_schema_and_data
+		#check_zabbix_templates_and_import
 
 
 		# create /etc/httpd/conf.d/monitorweb.conf
@@ -389,9 +390,9 @@ case "$1" in
 		start_tg_server
 
 		# START zabbix services.  SETUP default config files.
-		check_zab_server
-		check_zab_agentd
-		check_zab_webconfig
+		#check_zab_server
+		#check_zab_agentd
+		#check_zab_webconfig
 
 		result "$MESSAGE"
 	;;
@@ -441,8 +442,8 @@ case "$1" in
 		dialog "$MESSAGE"
 
 		stop_tg_server
-		service zabbix_server stop
-		service zabbix_agentd stop
+		#service zabbix_server stop
+		#service zabbix_agentd stop
 		# TODO: is there anything to stop?
 		result "$MESSAGE"
 	;;