Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow a proxy_server #74

Merged
merged 3 commits into from
Oct 9, 2019
Merged

allow a proxy_server #74

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6307a1
allow a proxy_server
wdpypere Oct 2, 2019
58609e7
fix remark
wdpypere Oct 2, 2019
2f208c3
add proxy_host to ood_portal_example.yml
wdpypere Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ood-portal-generator/lib/ood_portal_generator/view.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def initialize(opts = {})
@ssl = opts.fetch(:ssl, nil)
@listen_addr_port = opts.fetch(:listen_addr_port, nil)
@servername = opts.fetch(:servername, nil)
proxy_server = opts.fetch(:proxy_server, @servername)
wdpypere marked this conversation as resolved.
Show resolved Hide resolved
@port = opts.fetch(:port, @ssl ? "443" : "80")
@logroot = opts.fetch(:logroot, "logs")
@use_rewrites = opts.fetch(:use_rewrites, true)
Expand Down
8 changes: 4 additions & 4 deletions ood-portal-generator/templates/ood-portal.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ Listen <%= addr_port %>
<% if @ssl && @use_rewrites -%>
# Redirect all http traffic to the https Open OnDemand portal URI
# http://*:<%= @port %>
# #=> <%= @ssl ? "https" : "http" %>://<%= @servername || "localhost" %>:<%= @port %>
# #=> <%= @ssl ? "https" : "http" %>://<%= @proxy_server || "localhost" %>:<%= @port %>
#
<VirtualHost *:80>
RewriteEngine On
RewriteRule ^(.*) <%= @ssl ? "https" : "http" %>://<%= @servername || "%{SERVER_NAME}" %>:<%= @port %>$1 [R=301,NE,L]
RewriteRule ^(.*) <%= @ssl ? "https" : "http" %>://<%= @proxy_server || "%{SERVER_NAME}" %>:<%= @port %>$1 [R=301,NE,L]
</VirtualHost>
<% end -%>

Expand All @@ -68,8 +68,8 @@ Listen <%= addr_port %>

<%- if @use_rewrites -%>
RewriteEngine On
RewriteCond %{HTTP_HOST} !^(<%= @servername %>(:<%= @port %>)?)?$ [NC]
RewriteRule ^(.*) <%= @ssl ? "https" : "http" %>://<%= @servername %>:<%= @port %>$1 [R=301,NE,L]
RewriteCond %{HTTP_HOST} !^(<%= @proxy_server %>(:<%= @port %>)?)?$ [NC]
RewriteRule ^(.*) <%= @ssl ? "https" : "http" %>://<%= @proxy_server %>:<%= @port %>$1 [R=301,NE,L]
<%- end -%>
<%- end -%>

Expand Down