openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Move Listen definition to VHosts

Browse Source 
In order to avoid conflicts with other applications running Apache,
like keystone, we avoid using ports.conf for Listen and using VHost files
for this purpose.

We place same dummy template as keystone does for upgrade purposes.

Change-Id: I8a5ef5234b8aee1e7b3517e9543d2af0a84e90ce
This commit is contained in:
Dmitriy Rabotyagov 2022-02-09 13:49:21 +02:00
parent aa976a0544
commit 41f3380691
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/horizon_apache_ports.conf.j2
View File

@ -1,5 +1,6 @@
# {{ ansible_managed }} # {{ ansible_managed }}
{% for horizon_listen_port in horizon_listen_ports.values() %} # We place a blank file here
Listen {{ horizon_bind_address }}:{{ horizon_listen_port }} # Listen commands happen inside the individual VHost files
{% endfor %} # This allows for multiple services VHosts to exist without
# overwriting Listen lines.

4
templates/openstack_dashboard.conf.j2
View File

@ -1,5 +1,9 @@
# {{ ansible_managed }} # {{ ansible_managed }}
{% for horizon_listen_port in horizon_listen_ports.values() %}
Listen {{ horizon_bind_address }}:{{ horizon_listen_port }}
{% endfor %}
# If horizon is being served via SSL from this web server, # If horizon is being served via SSL from this web server,
# then we must redirect HTTP requests to HTTPS. # then we must redirect HTTP requests to HTTPS.
{% if (horizon_enable_ssl | bool) and not (horizon_external_ssl | bool) %} {% if (horizon_enable_ssl | bool) and not (horizon_external_ssl | bool) %}