X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=web%2Fmonitorweb-httpd.conf;fp=web%2Fmonitorweb-httpd.conf;h=bf28927a790924c1c34b3e11dc3db85d5c497223;hp=1ee0e3b7e7d7d7e702a3967f03942cb4f501a025;hb=e637272100e8e03884188cb2118b21158e739bb0;hpb=328ee7b92f4e23570d8a33ad9244413ae3aee6bf
diff --git a/web/monitorweb-httpd.conf b/web/monitorweb-httpd.conf
index 1ee0e3b..bf28927 100644
--- a/web/monitorweb-httpd.conf
+++ b/web/monitorweb-httpd.conf
@@ -1,36 +1,20 @@
-NameVirtualHost *
-
-
- ServerName pl-virtual-06.cs.princeton.edu
- ServerAdmin soltesz@cs.princeton.edu
- UseCanonicalName Off
- ServerSignature Off
-
- #DocumentRoot /usr/share/monitor/web/MonitorWeb/monitorweb
-
- #
- # Options Indexes FollowSymLinks
- # AllowOverride None
- # Order allow,deny
- # Allow from all
- #
-
- 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
-
-
+# NOTE: I've tried other means of redirection, including mod_rewrite, but did
+# not have any success. The means below is not idea, b/c it does not keep
+# non-ssl session as non-ssl. But it works.
+
+# NOTE: redirect path without trailing '/' to path with.
+Redirect /monitor /monitor/
+
+# NOTE: this directive strips '/monitor/' from the requested path and pastes
+# the remaining part to the end of the ProxyPass url below. All TG urls
+# should be relative to their current position, or the absolute path
+# that includes /monitor/ at the beginning.
+# TODO: make location configurable.
+
+ #LogLevel debug
+ #Errorlog /var/log/httpd/monitorwebapp-error_log
+ #Customlog /var/log/httpd/monitorwebapp-access_log common
+
+ ProxyPass http://127.0.0.1:8082/
+ ProxyPassReverse http://127.0.0.1:8082/
+