added httpd/conf.d/monitorweb.conf to /etc/plc.d/monitor.init

[monitor.git] / web / monitorweb-httpd.conf

diff --git a/web/monitorweb-httpd.conf b/web/monitorweb-httpd.conf
index ee84b73..a1935ae 100644 (file)
--- a/web/monitorweb-httpd.conf
+++ b/web/monitorweb-httpd.conf
@@ -6,9 +6,9 @@ NameVirtualHost 128.112.139.116:80
     UseCanonicalName Off
     ServerSignature Off
 
-    DocumentRoot /usr/share/monitor/tgweb/MonitorWeb/monitorweb
+    DocumentRoot /usr/share/monitor/web/MonitorWeb/monitorweb
 
-    <Directory "/usr/share/monitor/tgweb/MonitorWeb/monitorweb">
+    <Directory "/usr/share/monitor/web/MonitorWeb/monitorweb">
         Options Indexes FollowSymLinks
         AllowOverride None
         Order allow,deny
@@ -20,13 +20,16 @@ NameVirtualHost 128.112.139.116:80
 
     AddDefaultCharset utf-8
 
-    # Load everything out of the DocumentRoot that is static
-    ProxyPass /monitor/static !
+    #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
 
-    ProxyPass /monitor http://127.0.0.1:8080/
-    ProxyPassReverse /monitor http://127.0.0.1:8080/
-    ProxyPass /monitor/ http://127.0.0.1:8080/
-    ProxyPassReverse /monitor/ http://127.0.0.1:8080/
     ProxyPreserveHost On
     ProxyRequests Off