X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2Fmonitorweb-httpd.conf;h=1ee0e3b7e7d7d7e702a3967f03942cb4f501a025;hb=5beeef6caa515277a91a7fe91e84d9d6ed3cafdf;hp=ee84b732f94315f0223ad4c960b70ab2104091d0;hpb=66ef9d90a94833d30502006d1fcdafd5054086eb;p=monitor.git

diff --git a/web/monitorweb-httpd.conf b/web/monitorweb-httpd.conf
index ee84b73..1ee0e3b 100644
--- a/web/monitorweb-httpd.conf
+++ b/web/monitorweb-httpd.conf
@@ -1,32 +1,35 @@
-NameVirtualHost 128.112.139.116:80
+NameVirtualHost *
 
-<VirtualHost 128.112.139.116:80>
+<VirtualHost *>
     ServerName pl-virtual-06.cs.princeton.edu
     ServerAdmin soltesz@cs.princeton.edu
     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">
-        Options Indexes FollowSymLinks
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
+    #<Directory "/usr/share/monitor/web/MonitorWeb/monitorweb">
+    #    Options Indexes FollowSymLinks
+    #    AllowOverride None
+    #    Order allow,deny
+    #    Allow from all
+    #</Directory>
 
     Errorlog /var/log/httpd/monitorwebapp-error_log
     Customlog /var/log/httpd/monitorwebapp-access_log common
 
     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