Skip to content

Commit

Permalink
add support for server_aliases (#186)
Browse files Browse the repository at this point in the history
  • Loading branch information
johrstrom authored Apr 6, 2023
1 parent 398b444 commit 84ea6d3
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 0 deletions.
1 change: 1 addition & 0 deletions defaults/main/ood_portal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use_maintenance: true
servername: localhost
# proxy_server:
httpd_port: 80
server_aliases: []

# ssl_cert: "/etc/pki/tls/certs/www.example.com.crt"
# ssl_cert_key: "/etc/pki/tls/certs/www.example.com.key"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
6 changes: 6 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.custom.httpd
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
6 changes: 6 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.default.httpd
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
6 changes: 6 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.oidc.apache2
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
6 changes: 6 additions & 0 deletions molecule/default/fixtures/config/ood_portal.yml.oidc.httpd
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
# Default: null (don't use name-based Virtual Host)
servername: localhost

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
#server_aliases: []

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down
13 changes: 13 additions & 0 deletions templates/ood_portal.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@
{% else %}#servername: null
{% endif %}

# The server aliases used for the name-based Virtual Host
# Example:
# server_aliases:
# - foo.example.com
{% if server_aliases is defined and server_aliases|length > 0 %}
server_aliases:
{% for item in maintenance_ip_allowlist %}
- '{{ item }}'
{% endfor %}
{% else %}
#server_aliases: []
{% endif %}

# The server name used for rewrites
# Example:
# proxy_server: 'proxy.example.com'
Expand Down

0 comments on commit 84ea6d3

Please sign in to comment.