openstack/devstack
Code Issues Proposed changes

Merge "Add keystone VirtualHost for port 443 when USE_SSL is True"

Browse Source
This commit is contained in:
Jenkins 2016-12-02 15:27:47 +00:00 committed by Gerrit Code Review
commit ee548bc2bf
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/apache-keystone.template
View File

@ -34,6 +34,12 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"
%SSLKEYFILE% %SSLKEYFILE%
</VirtualHost> </VirtualHost>
%SSLLISTEN%<VirtualHost *:443>
%SSLLISTEN% %SSLENGINE%
%SSLLISTEN% %SSLCERTFILE%
%SSLLISTEN% %SSLKEYFILE%
%SSLLISTEN%</VirtualHost>
Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public
<Location /identity> <Location /identity>
SetHandler wsgi-script SetHandler wsgi-script

3
lib/keystone
View File

@ -153,6 +153,7 @@ function cleanup_keystone {
function _config_keystone_apache_wsgi { function _config_keystone_apache_wsgi {
local keystone_apache_conf local keystone_apache_conf
keystone_apache_conf=$(apache_site_config_for keystone) keystone_apache_conf=$(apache_site_config_for keystone)
keystone_ssl_listen="#"
local keystone_ssl="" local keystone_ssl=""
local keystone_certfile="" local keystone_certfile=""
local keystone_keyfile="" local keystone_keyfile=""
@ -161,6 +162,7 @@ function _config_keystone_apache_wsgi {
local venv_path="" local venv_path=""
if is_ssl_enabled_service key; then if is_ssl_enabled_service key; then
keystone_ssl_listen=""
keystone_ssl="SSLEngine On" keystone_ssl="SSLEngine On"
keystone_certfile="SSLCertificateFile $KEYSTONE_SSL_CERT" keystone_certfile="SSLCertificateFile $KEYSTONE_SSL_CERT"
keystone_keyfile="SSLCertificateKeyFile $KEYSTONE_SSL_KEY" keystone_keyfile="SSLCertificateKeyFile $KEYSTONE_SSL_KEY"
@ -178,6 +180,7 @@ function _config_keystone_apache_wsgi {
s|%PUBLICPORT%|$keystone_service_port|g; s|%PUBLICPORT%|$keystone_service_port|g;
s|%ADMINPORT%|$keystone_auth_port|g; s|%ADMINPORT%|$keystone_auth_port|g;
s|%APACHE_NAME%|$APACHE_NAME|g; s|%APACHE_NAME%|$APACHE_NAME|g;
s|%SSLLISTEN%|$keystone_ssl_listen|g;
s|%SSLENGINE%|$keystone_ssl|g; s|%SSLENGINE%|$keystone_ssl|g;
s|%SSLCERTFILE%|$keystone_certfile|g; s|%SSLCERTFILE%|$keystone_certfile|g;
s|%SSLKEYFILE%|$keystone_keyfile|g; s|%SSLKEYFILE%|$keystone_keyfile|g;