Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions defaults/main/ood_portal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ pun_stage_cmd: "sudo {{ ood_base_dir }}/nginx_stage/sbin/nginx_stage"

# node_uri: '/node'
# rnode_uri: '/rnode'
# secure_node_uri: '/secure-node'
# secure_rnode_uri: '/secure-rnode'
# ssl_proxy: []
host_regex: '[^/]+'

pun_uri: "/pun"
Expand Down
31 changes: 31 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.custom.apache2
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,37 @@ node_uri: /custom-node-path
# Default: null (disable this feature)
rnode_uri: /custom-rnode-path

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that knows
# the full URI path
# Example:
# secure_node_uri: '/secure-node'
# Default: null (disable this feature)
secure_node_uri: /custom-secure-node

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that
# ONLY uses *relative* URI paths
# Example:
# secure_rnode_uri: '/secure-rnode'
# Default: null (disable this feature)
secure_rnode_uri: /custom-secure-rnode

# List of SSL Proxy Apache directives
# These settings control SSL validation for the upstream connection and require
# a secure_[r]node_uri to be defined
# to.
# Example:
# ssl_proxy:
# - 'SSLProxyCheckPeerCN Off'
# - 'SSLProxyCheckPeerName Off'
# Default: [] (no additional SSL proxy settings)
ssl_proxy:
- 'SSLProxyCheckPeerCN Off'
- 'SSLProxyCheckPeerName Off'

#
# Per-user NGINX Passenger apps
#
Expand Down
31 changes: 31 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.custom.httpd
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,37 @@ node_uri: /custom-node-path
# Default: null (disable this feature)
rnode_uri: /custom-rnode-path

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that knows
# the full URI path
# Example:
# secure_node_uri: '/secure-node'
# Default: null (disable this feature)
secure_node_uri: /custom-secure-node

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that
# ONLY uses *relative* URI paths
# Example:
# secure_rnode_uri: '/secure-rnode'
# Default: null (disable this feature)
secure_rnode_uri: /custom-secure-rnode

# List of SSL Proxy Apache directives
# These settings control SSL validation for the upstream connection and require
# a secure_[r]node_uri to be defined
# to.
# Example:
# ssl_proxy:
# - 'SSLProxyCheckPeerCN Off'
# - 'SSLProxyCheckPeerName Off'
# Default: [] (no additional SSL proxy settings)
ssl_proxy:
- 'SSLProxyCheckPeerCN Off'
- 'SSLProxyCheckPeerName Off'

#
# Per-user NGINX Passenger apps
#
Expand Down
29 changes: 29 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.default.apache2
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,35 @@ host_regex: '[^/]+'
# Default: null (disable this feature)
#rnode_uri: null

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that knows
# the full URI path
# Example:
# secure_node_uri: '/secure-node'
# Default: null (disable this feature)
#secure_node_uri: null

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that
# ONLY uses *relative* URI paths
# Example:
# secure_rnode_uri: '/secure-rnode'
# Default: null (disable this feature)
#secure_rnode_uri: null

# List of SSL Proxy Apache directives
# These settings control SSL validation for the upstream connection and require
# a secure_[r]node_uri to be defined
# to.
# Example:
# ssl_proxy:
# - 'SSLProxyCheckPeerCN Off'
# - 'SSLProxyCheckPeerName Off'
# Default: [] (no additional SSL proxy settings)
#ssl_proxy: []

#
# Per-user NGINX Passenger apps
#
Expand Down
29 changes: 29 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.default.httpd
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,35 @@ host_regex: '[^/]+'
# Default: null (disable this feature)
#rnode_uri: null

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that knows
# the full URI path
# Example:
# secure_node_uri: '/secure-node'
# Default: null (disable this feature)
#secure_node_uri: null

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that
# ONLY uses *relative* URI paths
# Example:
# secure_rnode_uri: '/secure-rnode'
# Default: null (disable this feature)
#secure_rnode_uri: null

# List of SSL Proxy Apache directives
# These settings control SSL validation for the upstream connection and require
# a secure_[r]node_uri to be defined
# to.
# Example:
# ssl_proxy:
# - 'SSLProxyCheckPeerCN Off'
# - 'SSLProxyCheckPeerName Off'
# Default: [] (no additional SSL proxy settings)
#ssl_proxy: []

#
# Per-user NGINX Passenger apps
#
Expand Down
29 changes: 29 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.oidc.apache2
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,35 @@ node_uri: /custom-node-path
# Default: null (disable this feature)
rnode_uri: /custom-rnode-path

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that knows
# the full URI path
# Example:
# secure_node_uri: '/secure-node'
# Default: null (disable this feature)
#secure_node_uri: null

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that
# ONLY uses *relative* URI paths
# Example:
# secure_rnode_uri: '/secure-rnode'
# Default: null (disable this feature)
#secure_rnode_uri: null

# List of SSL Proxy Apache directives
# These settings control SSL validation for the upstream connection and require
# a secure_[r]node_uri to be defined
# to.
# Example:
# ssl_proxy:
# - 'SSLProxyCheckPeerCN Off'
# - 'SSLProxyCheckPeerName Off'
# Default: [] (no additional SSL proxy settings)
#ssl_proxy: []

#
# Per-user NGINX Passenger apps
#
Expand Down
29 changes: 29 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.oidc.httpd
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,35 @@ node_uri: /custom-node-path
# Default: null (disable this feature)
rnode_uri: /custom-rnode-path

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that knows
# the full URI path
# Example:
# secure_node_uri: '/secure-node'
# Default: null (disable this feature)
#secure_node_uri: null

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that
# ONLY uses *relative* URI paths
# Example:
# secure_rnode_uri: '/secure-rnode'
# Default: null (disable this feature)
#secure_rnode_uri: null

# List of SSL Proxy Apache directives
# These settings control SSL validation for the upstream connection and require
# a secure_[r]node_uri to be defined
# to.
# Example:
# ssl_proxy:
# - 'SSLProxyCheckPeerCN Off'
# - 'SSLProxyCheckPeerName Off'
# Default: [] (no additional SSL proxy settings)
#ssl_proxy: []

#
# Per-user NGINX Passenger apps
#
Expand Down
5 changes: 5 additions & 0 deletions molecule/default/vars/portal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ user_map_match: '^([^@]+)@.*$'
rnode_uri: '/custom-rnode-path'
node_uri: '/custom-node-path'
oidc_uri: '/custom-oidc-path'
secure_node_uri: '/custom-secure-node'
secure_rnode_uri: '/custom-secure-rnode'
ssl_proxy:
- 'SSLProxyCheckPeerCN Off'
- 'SSLProxyCheckPeerName Off'
httpd_error_log: 'custom_defined_error.log'
httpd_access_log: 'custom_defined_access.log'
httpd_logformat: '"%O %h \"%{Referer}i\" \"%r\" %v \"%{User-Agent}i\" %{SSL_PROTOCOL}e %T %>s"'
Expand Down
40 changes: 40 additions & 0 deletions templates/ood_portal.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,46 @@ host_regex: '{{ host_regex }}'
{% else %}#rnode_uri: null
{% endif %}

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that knows
# the full URI path
# Example:
# secure_node_uri: '/secure-node'
# Default: null (disable this feature)
{% if secure_node_uri is defined %}secure_node_uri: {{ secure_node_uri }}
{% else %}#secure_node_uri: null
{% endif %}

# This path will force the upstream connection to use HTTPS or WSS, used for
# backend applications that are running their own SSL termination
# Sub-uri used to reverse proxy to backend web server running on node that
# ONLY uses *relative* URI paths
# Example:
# secure_rnode_uri: '/secure-rnode'
# Default: null (disable this feature)
{% if secure_rnode_uri is defined %}secure_rnode_uri: {{ secure_rnode_uri }}
{% else %}#secure_rnode_uri: null
{% endif %}

# List of SSL Proxy Apache directives
# These settings control SSL validation for the upstream connection and require
# a secure_[r]node_uri to be defined
# to.
# Example:
# ssl_proxy:
# - 'SSLProxyCheckPeerCN Off'
# - 'SSLProxyCheckPeerName Off'
# Default: [] (no additional SSL proxy settings)
{% if ssl_proxy is defined %}
ssl_proxy:
{% for directive in ssl_proxy %}
- '{{ directive }}'
{% endfor %}
{% else %}
#ssl_proxy: []
{% endif %}

#
# Per-user NGINX Passenger apps
#
Expand Down