Merge pull request #40 from OSC/disable-rewrite

Support disabling RewriteEngine
OSC · Jun 27, 2019 · cf5d15b · cf5d15b
2 parents b16c43a + fbbdd27
commit cf5d15b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/ood-portal-generator/lib/ood_portal_generator/version.rb b/ood-portal-generator/lib/ood_portal_generator/version.rb
@@ -1,4 +1,4 @@
 module OodPortalGenerator
   # The current version of OodPortalGenerator
-  VERSION= "0.8.0"
+  VERSION= "0.9.0"
 end
diff --git a/ood-portal-generator/lib/ood_portal_generator/view.rb b/ood-portal-generator/lib/ood_portal_generator/view.rb
@@ -14,6 +14,7 @@ def initialize(opts = {})
       @servername       = opts.fetch(:servername, nil)
       @port             = opts.fetch(:port, @ssl ? "443" : "80")
       @logroot          = opts.fetch(:logroot, "logs")
+      @use_rewrites     = opts.fetch(:use_rewrites, true)
       @lua_root         = opts.fetch(:lua_root, "/opt/ood/mod_ood_proxy/lib")
       @lua_log_level    = opts.fetch(:lua_log_level, "info")
       @user_map_cmd     = opts.fetch(:user_map_cmd, "/opt/ood/ood_auth_map/bin/ood_auth_map.regex")

diff --git a/ood-portal-generator/share/ood_portal_example.yml b/ood-portal-generator/share/ood_portal_example.yml
@@ -35,6 +35,12 @@
 # Default: 'logs' (this is relative to ServerRoot)
 #logroot: 'logs'
 
+# Should RewriteEngine be used
+# Example:
+#     use_rewrites: false
+# Default: true
+#use_rewrites: true
+
 # Root directory of the Lua handler code
 # Example:
 #     lua_root: '/path/to/lua/handlers'

diff --git a/ood-portal-generator/templates/ood-portal.conf.erb b/ood-portal-generator/templates/ood-portal.conf.erb
@@ -46,7 +46,7 @@ Listen <%= addr_port %>
 <% end -%>
 <% end -%>
 
-<% if @ssl -%>
+<% if @ssl && @use_rewrites -%>
 # Redirect all http traffic to the https Open OnDemand portal URI
 #     http://*:<%= @port %>
 #     #=> <%= @ssl ? "https" : "http" %>://<%= @servername || "localhost" %>:<%= @port %>
@@ -66,10 +66,12 @@ Listen <%= addr_port %>
   ErrorLog  "<%= @logroot %>/<%= @servername %>_error<%= "_ssl" if @ssl %>.log"
   CustomLog "<%= @logroot %>/<%= @servername %>_access<%= "_ssl" if @ssl %>.log" combined
 
+  <%- if @use_rewrites -%>
   RewriteEngine On
   RewriteCond %{HTTP_HOST} !^(<%= @servername %>(:<%= @port %>)?)?$ [NC]
   RewriteRule ^(.*) <%= @ssl ? "https" : "http" %>://<%= @servername %>:<%= @port %>$1 [R=301,NE,L]
   <%- end -%>
+  <%- end -%>
 
   <%- if @ssl -%>
   SSLEngine On