X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=monitor-server.init;h=c477c89a743ca458faa70b69028d5f871e6121e0;hb=f4c8ac6cb9e1418ced303fd9f715e76b275af00d;hp=dc984ad2cab68239bf1a4f5b8cb87ded8b592c89;hpb=1052300e95f159ecded8c1b392c3cb35d2713f51;p=monitor.git diff --git a/monitor-server.init b/monitor-server.init index dc984ad..c477c89 100644 --- a/monitor-server.init +++ b/monitor-server.init @@ -231,6 +231,68 @@ EOF fi } +function create_httpd_conf () +{ + MONITOR_HTTP_CONF=/etc/httpd/conf.d/monitorweb.conf + + if [ ! -f ${MONITOR_HTTP_CONF} ] ; then + # note: we need to either start this script before httpd, or always + # restart httpd, since there's no way to know beyond file's existence + # whether the values have changed or not. + WROTE_HTTP_CONFIG="true" + fi + + # TODO: make http port configurable. + # TODO: make proxy port configurable. + + cat < ${MONITOR_HTTP_CONF} +NameVirtualHost ${PLC_MONITOR_IP}:80 + + + ServerName ${PLC_MONITOR_HOST} + ServerAdmin ${PLC_MONITOR_EMAIL} + UseCanonicalName Off + ServerSignature Off + + DocumentRoot ${MONITORPATH}/web/MonitorWeb/monitorweb + + + Options Indexes FollowSymLinks + AllowOverride None + Order allow,deny + Allow from all + + + #LogLevel debug + Errorlog /var/log/httpd/monitorwebapp-error_log + Customlog /var/log/httpd/monitorwebapp-access_log common + + AddDefaultCharset utf-8 + + #NOTE: This doesn't work as expected. + # Load everything out of the DocumentRoot that is static + # ProxyPass /monitor/static ! + + ProxyPass /tg_js http://127.0.0.1:8080/tg_js + ProxyPassReverse /tg_js http://127.0.0.1:8080/tg_js + + ProxyPass /monitor http://127.0.0.1:8080 + ProxyPassReverse /monitor http://127.0.0.1:8080 + + ProxyPreserveHost On + ProxyRequests Off + + +EOF +} + +function start_tg_server () +{ + pushd ${MONITORPATH}/web/MonitorWeb/ + ./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log + popd +} + function check_zab_server () { ZABBIXCFG=/etc/zabbix @@ -308,6 +370,7 @@ case "$1" in if [ -n "$WROTE_PG_CONFIG" ] ; then # NOTE: restart db to enable access by users granted above. service plc restart postgresql + service plc restart httpd fi check_zabbix_schema_and_data @@ -316,6 +379,14 @@ case "$1" in # WRITE default /etc/monitor.conf check_monitor_conf + # create /etc/httpd/conf.d/monitorweb.conf + create_httpd_conf + if [ -n "$WROTE_HTTP_CONFIG" ] ; then + # NOTE: restart web server to enable access web cfg + service plc restart httpd + fi + start_tg_server + # START zabbix services. SETUP default config files. check_zab_server check_zab_agentd