X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=098ecbad4f67e9832f3f31f5a45b4db9080221ff;hb=5beeef6caa515277a91a7fe91e84d9d6ed3cafdf;hp=dc984ad2cab68239bf1a4f5b8cb87ded8b592c89;hpb=8e90984231a680415cc3f6a60f008b3029ad4548;p=monitor.git

diff --git a/monitor-server.init b/monitor-server.init
index dc984ad..098ecba 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -231,6 +231,71 @@ 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 <<EOF > ${MONITOR_HTTP_CONF}
+NameVirtualHost *
+
+<VirtualHost *>
+    ServerName ${PLC_MONITOR_HOST}
+    ServerAdmin ${PLC_MONITOR_EMAIL}
+    UseCanonicalName Off
+    ServerSignature Off
+
+	# NOTE: this appears to alter the global document root, for port 80...
+	#  not sure if it's possible to serve two different 'virtualhosts' from
+	#  the same port and same hostname with different document roots...
+    #DocumentRoot ${MONITORPATH}/web/MonitorWeb/monitorweb
+
+    #<Directory "${MONITORPATH}/web/MonitorWeb/monitorweb">
+    #    Options Indexes FollowSymLinks
+    #    AllowOverride None
+    #    Order allow,deny
+    #    Allow from all
+    #</Directory>
+
+    #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
+
+</VirtualHost>
+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 +373,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 +382,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