3a14a988b9
This patch revises the SSL certificate management and distribution with something that is more consistent with how it's done everywhere else in the project. It also repairs the current user provided certificate distribution which was broken. * The server key/certificate (and optionally a CA cert) are distributed to all horizon containers. * Two new variables have been implemented for a user-provided server key and certificate: - horizon_user_ssl_cert: <path to cert on deployment host> - horizon_user_ssl_key: <path to cert on deployment host> If either of these is not defined, then the missing cert/key will be self generated on the first Horizon container and distributed to the other containers. * A new variable has been implemented for a user-provided CA certificate: - horizon_user_ssl_ca_cert: <path to cert on deployment host> * A new variable called 'horizon_ssl_self_signed_subject' has been implemented to allow the user to override the self-signed certificate properties, such as the CN and subjectAltName. Upgrade notes: * The Apache configuration appropriately implements the 'SSLCACertificateFile' instead of the 'SSLCACertificatePath' directive in order to ensure that the appropriate signing certificate is provided to the browser. * The variable 'horizon_self_signed' (which defaulted to true) has been removed. The decision of whether to generate a self-signed certificate has been made based on whether a user provided key/cert pair has been provided. * The 'horizon_self_signed_regen' variable has been renamed to 'horizon_ssl_self_signed_regen'. * The default names for the deployed keys/certificates have been changed: - /etc/ssl/certs/apache.cert > /etc/ssl/certs/horizon.pem - /etc/ssl/private/apache.key > /etc/ssl/private/horizon.key DocImpact UpgradeImpact Closes-Bug: #1475578 Change-Id: I7089abbd81ce422b21ce65488e8bc32053ba32ca
52 lines
1.6 KiB
Django/Jinja
52 lines
1.6 KiB
Django/Jinja
# {{ ansible_managed }}
|
|
|
|
{% set threads = ansible_processor_vcpus // 2 %}
|
|
|
|
<VirtualHost *:80>
|
|
ServerName {{ horizon_server_name }}
|
|
RewriteEngine On
|
|
RewriteCond %{HTTPS} !=on
|
|
RewriteRule ^/?(.*) https://%{HTTP_HOST}/$1 [R,L]
|
|
</VirtualHost>
|
|
|
|
<VirtualHost *:443>
|
|
ServerName {{ horizon_server_name }}
|
|
|
|
LogLevel {{ horizon_log_level }}
|
|
ErrorLog /var/log/horizon/horizon-error.log
|
|
CustomLog /var/log/horizon/ssl_access.log combined
|
|
Options +FollowSymLinks
|
|
|
|
SSLEngine on
|
|
SSLCertificateFile {{ horizon_ssl_cert }}
|
|
SSLCertificateKeyFile {{ horizon_ssl_key }}
|
|
{% if horizon_user_ssl_ca_cert is defined -%}
|
|
SSLCACertificateFile {{ horizon_ssl_ca_cert }}
|
|
{% endif -%}
|
|
SSLCompression Off
|
|
SSLProtocol All -SSLv2 -SSLv3
|
|
SSLHonorCipherOrder On
|
|
SSLCipherSuite {{ horizon_ssl_cipher_suite }}
|
|
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
|
|
|
|
WSGIScriptAlias / {{ horizon_lib_dir }}/openstack_dashboard/wsgi/django.wsgi
|
|
WSGIDaemonProcess horizon user={{ horizon_system_user_name }} group={{ horizon_system_group_name }} processes={{ ansible_processor_cores }} threads={{ threads if threads > 0 else 1 }}
|
|
|
|
Alias /static {{ horizon_lib_dir }}/static/
|
|
<Directory /usr/local/lib/python2.7/dist-packages/openstack_dashboard/wsgi/>
|
|
<Files django.wsgi>
|
|
Order allow,deny
|
|
allow from all
|
|
Require all granted
|
|
</Files>
|
|
</Directory>
|
|
|
|
<Directory {{ horizon_lib_dir }}/static/>
|
|
Options -FollowSymlinks
|
|
AllowOverride None
|
|
Order allow,deny
|
|
allow from all
|
|
Require all granted
|
|
</Directory>
|
|
</VirtualHost>
|