merge from 2.0 branch

[monitor.git] / monitor-server.init

diff --git a/monitor-server.init b/monitor-server.init
index a194ebe..5ffe974 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
@@ -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
@@ -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
@@ -361,10 +362,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.
@@ -374,8 +374,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
@@ -389,9 +391,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"
        ;;
@@ -427,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
@@ -441,8 +443,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"
        ;;