pull in additional changes from 2.0 branch.

[monitor.git] / monitor-server.init

diff --git a/monitor-server.init b/monitor-server.init
index 12193da..a2cab5a 100644 (file)
--- 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
@@ -428,8 +428,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