Commit 8799c4af authored by Frank Greguska's avatar Frank Greguska
Browse files

simplified the configuration using a redirect instead of mod_rewrite

parent 9f30e980

esgf_config/httpd/conf/esgf-httpd.conf

+7 −11
Original line number Diff line number Diff line
@@ -82,10 +82,6 @@ WSGISocketPrefix run/wsgi 
  RequestHeader set SSL_SERVER_S_DN_OU "%{SSL_SERVER_S_DN_OU}s"

  RequestHeader set SSL_CLIENT_VERIFY "%{SSL_CLIENT_VERIFY}s"



  # RewriteRules

  RewriteEngine On

  RewriteRule ^/visusviewer$ https://%{HTTP_HOST}%{REQUEST_URI}/viewer.html [R]



  # proxy requests to Jetty

  ProxyPassMatch  ^/solr(.*)$     http://esgf-solr:8983/solr$1

  ProxyPassReverse        /solr   http://esgf-solr:8983/solr
@@ -115,10 +111,10 @@ WSGISocketPrefix run/wsgi 
  ProxyPassReverse /slcs-static http://slcs-nginx timeout=600



  # proxy requests for visus web viewer

  ProxyPass /visusviewer http://visus-server timeout=600

  ProxyPassReverse /visusviewer http://visus-server timeout=600

  ProxyPass /mod_visus http://visus-server/mod_visus timeout=600

  ProxyPassReverse /mod_visus http://visus-server/mod_visus timeout=600

  Redirect permanent /visusviewer /visusviewer/

  Redirect permanent /mod_visus /visusviewer/mod_visus

  ProxyPass /visusviewer/ http://visus-server/ timeout=600

  ProxyPassReverse /visusviewer/ http://visus-server/ timeout=600



  # Node Manager

  WSGIDaemonProcess esgfnm python-path=/opt/esgf/virtual/python/lib/python2.7/site-packages:/usr/local/esgf-node-manager/src/python/server user=apache group=apache threads=5