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

diff --git a/monitor-server.init b/monitor-server.init
index 3fb1728..6817b6a 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
@@ -192,11 +192,13 @@ API_AUTH_PASSWORD=${PLC_MONITOR_DBPASSWORD}
 MONITOR_SCRIPT_ROOT=${MONITORPATH}
 MONITOR_DATA_ROOT=/var/lib/monitor
 MONITOR_ARCHIVE_ROOT=/var/lib/monitor/archive-pdb
+MONITOR_BOOTMANAGER_LOG=/var/www/html/monitorlog
 
 MONITOR_HOSTNAME=${PLC_MONITOR_HOST}
 MONITOR_IP=${PLC_MONITOR_IP}
 
 PLC_WWW_HOSTNAME=${PLC_WWW_HOST}
+PLC_NAME=${PLC_NAME}
 
 # used for debug mode
 email=
@@ -219,6 +221,7 @@ cachetime=60
 # Evaluated as true or false
 [commandline]
 cachecalls=True
+embedded=False
 
 echo=False
 debug=False
@@ -255,7 +258,7 @@ function create_httpd_conf ()
 # 	non-ssl session as non-ssl.  But it works.
 
 # NOTE: redirect path without trailing '/' to path with.  Favor SSL.
-Redirect /monitor https://${MONITOR_HOSTNAME}:${PLC_WWW_SSL_PORT}/monitor/
+Redirect /monitor https://${PLC_MONITOR_HOST}:${PLC_WWW_SSL_PORT}/monitor/
 
 # NOTE: this directive strips '/monitor/' from the requested path and pastes
 #       the remaining part to the end of the ProxyPass url below.  All TG urls
@@ -267,8 +270,8 @@ Redirect /monitor https://${MONITOR_HOSTNAME}:${PLC_WWW_SSL_PORT}/monitor/
     #Errorlog /var/log/httpd/monitorwebapp-error_log
     #Customlog /var/log/httpd/monitorwebapp-access_log common
 
-    ProxyPass http://127.0.0.1:8080/
-    ProxyPassReverse http://127.0.0.1:8080/
+    ProxyPass http://127.0.0.1:8082/
+    ProxyPassReverse http://127.0.0.1:8082/
 </Location>
 
 EOF
@@ -276,6 +279,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
@@ -360,10 +364,9 @@ case "$1" in
 		check_user_and_db $MONITOR_DB_NAME $MONITOR_DB_USER
 		# WRITE default /etc/monitor.conf
 		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.
@@ -373,8 +376,10 @@ case "$1" in
 			dialog "$MESSAGE"
 		fi
 
-		check_zabbix_schema_and_data
-		check_zabbix_templates_and_import
+		check_monitor_schema_and_data
+
+		#check_zabbix_schema_and_data
+		#check_zabbix_templates_and_import
 
 
 		# create /etc/httpd/conf.d/monitorweb.conf
@@ -388,9 +393,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"
 	;;
@@ -412,7 +417,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,13 +427,26 @@ 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"
 
 		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"
 	;;