git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from 2.0 branch
[monitor.git]
/
monitor-server.init
diff --git
a/monitor-server.init
b/monitor-server.init
index
a2cab5a
..
5ffe974
100644
(file)
--- a/
monitor-server.init
+++ b/
monitor-server.init
@@
-268,8
+268,8
@@
Redirect /monitor https://${PLC_MONITOR_HOST}:${PLC_WWW_SSL_PORT}/monitor/
#Errorlog /var/log/httpd/monitorwebapp-error_log
#Customlog /var/log/httpd/monitorwebapp-access_log common
#Errorlog /var/log/httpd/monitorwebapp-error_log
#Customlog /var/log/httpd/monitorwebapp-access_log common
- ProxyPass http://127.0.0.1:808
0
/
- ProxyPassReverse http://127.0.0.1:808
0
/
+ ProxyPass http://127.0.0.1:808
2
/
+ ProxyPassReverse http://127.0.0.1:808
2
/
</Location>
EOF
</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_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
@@
-375,6
+374,8
@@
case "$1" in
dialog "$MESSAGE"
fi
dialog "$MESSAGE"
fi
+ check_monitor_schema_and_data
+
#check_zabbix_schema_and_data
#check_zabbix_templates_and_import
#check_zabbix_schema_and_data
#check_zabbix_templates_and_import