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

diff --git a/monitor-server.init b/monitor-server.init
index 12193da..5ffe974 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -256,7 +256,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
@@ -268,8 +268,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
@@ -362,7 +362,6 @@ 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
@@ -375,6 +374,8 @@ case "$1" in
 			dialog "$MESSAGE"
 		fi
 
+		check_monitor_schema_and_data
+
 		#check_zabbix_schema_and_data
 		#check_zabbix_templates_and_import
 
@@ -428,8 +429,8 @@ case "$1" in
 		MESSAGE=$"Deleting databases..."
 		dialog "$MESSAGE"
 
-		dropdb -U postgres $ZABBIX_DB_NAME
-		dropuser -U postgres $ZABBIX_DB_USER
+		#dropdb -U postgres $ZABBIX_DB_NAME
+		#dropuser -U postgres $ZABBIX_DB_USER
 
 		dropdb -U postgres $MONITOR_DB_NAME
 		dropuser -U postgres $MONITOR_DB_USER