openstack/devstack
Code Issues Proposed changes

keystone: fix prefixed URL

Browse Source 
Commit 2ad1a42ca6 broke entirely the
Apache configuration for Keystone when used without a port on the
/identity URL. This patch fixes that.

Change-Id: I47805138c66456c9c5fa9af1f4ac33b03d0ce5b9
This commit is contained in:
Julien Danjou 2015-09-21 14:19:52 +00:00
parent 2a16b51264
commit 382f982e51
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
files/apache-keystone.template
View File

@ -2,6 +2,16 @@ Listen %PUBLICPORT%
Listen %ADMINPORT% Listen %ADMINPORT%
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" keystone_combined LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" keystone_combined
<Directory %KEYSTONE_BIN%>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
</Directory>
<VirtualHost *:%PUBLICPORT%> <VirtualHost *:%PUBLICPORT%>
WSGIDaemonProcess keystone-public processes=5 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% WSGIDaemonProcess keystone-public processes=5 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
WSGIProcessGroup keystone-public WSGIProcessGroup keystone-public
@ -16,16 +26,6 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"
%SSLENGINE% %SSLENGINE%
%SSLCERTFILE% %SSLCERTFILE%
%SSLKEYFILE% %SSLKEYFILE%
<Directory %KEYSTONE_BIN%>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
</Directory>
</VirtualHost> </VirtualHost>
<VirtualHost *:%ADMINPORT%> <VirtualHost *:%ADMINPORT%>
@ -42,19 +42,9 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"
%SSLENGINE% %SSLENGINE%
%SSLCERTFILE% %SSLCERTFILE%
%SSLKEYFILE% %SSLKEYFILE%
<Directory %KEYSTONE_BIN%>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
</Directory>
</VirtualHost> </VirtualHost>
Alias /identity %PUBLICWSGI% Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public
<Location /identity> <Location /identity>
SetHandler wsgi-script SetHandler wsgi-script
Options +ExecCGI Options +ExecCGI
@ -64,7 +54,7 @@ Alias /identity %PUBLICWSGI%
WSGIPassAuthorization On WSGIPassAuthorization On
</Location> </Location>
Alias /identity_admin %ADMINWSGI% Alias /identity_admin %KEYSTONE_BIN%/keystone-wsgi-admin
<Location /identity_admin> <Location /identity_admin>
SetHandler wsgi-script SetHandler wsgi-script
Options +ExecCGI Options +ExecCGI