openstack
/
openstack-ansible-os_horizon
Code Issues Proposed changes

Merge "Reflect horizon_webroot setting in Apache vhost configuration"

This commit is contained in:
Zuul 2024-03-28 13:19:35 +00:00 committed by Gerrit Code Review
parent 99499ec289 552fcac122
commit 5d0255cf26
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/horizon_webroot-098629f30f69f192.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Change of ``horizon_webroot`` variable is now respected and will be
reflected in Apache configuration to serve static files and define
wsgi path accordingly.

4
templates/openstack_dashboard.conf.j2
View File

@ -48,7 +48,7 @@ Listen {{ horizon_bind_address }}:{{ horizon_listen_port }}
RequestHeader set {{ horizon_secure_proxy_ssl_header }} "http" RequestHeader set {{ horizon_secure_proxy_ssl_header }} "http"
{% endif %} {% endif %}
WSGIScriptAlias / {{ horizon_lib_wsgi_file }} WSGIScriptAlias {{ horizon_webroot }} {{ horizon_lib_wsgi_file }}
WSGIDaemonProcess horizon user={{ horizon_system_user_name }} group={{ horizon_system_group_name }} processes={{ horizon_wsgi_processes | default(horizon_wsgi_threads) }} threads={{ horizon_wsgi_threads }} python-path={{ horizon_lib_dir | dirname }}/site-packages WSGIDaemonProcess horizon user={{ horizon_system_user_name }} group={{ horizon_system_group_name }} processes={{ horizon_wsgi_processes | default(horizon_wsgi_threads) }} threads={{ horizon_wsgi_threads }} python-path={{ horizon_lib_dir | dirname }}/site-packages
WSGIProcessGroup horizon WSGIProcessGroup horizon
@ -66,7 +66,7 @@ Listen {{ horizon_bind_address }}:{{ horizon_listen_port }}
</Files> </Files>
</Directory> </Directory>
Alias /static {{ horizon_lib_dir }}/static/ Alias {{ horizon_webroot }}/static {{ horizon_lib_dir }}/static/
<Directory {{ horizon_lib_dir }}/static/> <Directory {{ horizon_lib_dir }}/static/>
Options -FollowSymlinks Options -FollowSymlinks