Added support for multiple domains for Apache config in portal generator

OSC · Dec 21, 2023 · d9833a2 · d9833a2
1 parent bf38433
commit d9833a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/ood-portal-generator/lib/ood_portal_generator/view.rb b/ood-portal-generator/lib/ood_portal_generator/view.rb
@@ -26,6 +26,7 @@ def initialize(opts = {})
       @server_aliases   = opts.fetch(:server_aliases, [])
       @proxy_server     = opts.fetch(:proxy_server, servername)
       @allowed_hosts    = allowed_hosts
+      @multiple_hosts   = opts.fetch(:multiple_hosts, false)
       @port             = opts.fetch(:port, @ssl ? "443" : "80")
       if OodPortalGenerator.debian?
         @logroot        = opts.fetch(:logroot, "/var/log/apache2")

diff --git a/ood-portal-generator/share/ood_portal_example.yml b/ood-portal-generator/share/ood_portal_example.yml
@@ -27,6 +27,12 @@
 # Default: The value of servername
 #proxy_server: null
 
+# To allow access to the server on different domains
+# Example:
+#     multiple_hosts: true
+# Default: false
+#multiple_hosts: false
+
 # The port specification for the Virtual Host
 # Example:
 #     port: 8080

diff --git a/ood-portal-generator/templates/ood-portal.conf.erb b/ood-portal-generator/templates/ood-portal.conf.erb
@@ -85,7 +85,7 @@ Listen <%= addr_port %>
   CustomLog "<%= @accesslog %>" combined
   <%- end -%>
 
-  <%- if @servername && @use_rewrites -%>
+  <%- if !@multiple_hosts && @servername && @use_rewrites -%>
   RewriteEngine On
   RewriteCond %{HTTP_HOST} !^(<%= @proxy_server %>(:<%= @port %>)?)?$ [NC]
   RewriteRule ^(.*) <%= @ssl ? "https" : "http" %>://<%= @proxy_server %>:<%= @port %>$1 [R=301,NE,L]