@@ -2,6 +2,16 @@ Listen %PUBLICPORT%

 Listen %ADMINPORT%

 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%>

     WSGIDaemonProcess keystone-public processes=5 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%

     WSGIProcessGroup keystone-public

@@ -16,16 +26,6 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"

     %SSLENGINE%

     %SSLCERTFILE%

     %SSLKEYFILE%

-

-    <Directory %KEYSTONE_BIN%>

-        <IfVersion >= 2.4>

-            Require all granted

-        </IfVersion>

-        <IfVersion < 2.4>

-            Order allow,deny

-            Allow from all

-        </IfVersion>

-    </Directory>

 </VirtualHost>

 <VirtualHost *:%ADMINPORT%>

@@ -42,19 +42,9 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)"

     %SSLENGINE%

     %SSLCERTFILE%

     %SSLKEYFILE%

-

-    <Directory %KEYSTONE_BIN%>

-        <IfVersion >= 2.4>

-            Require all granted

-        </IfVersion>

-        <IfVersion < 2.4>

-            Order allow,deny

-            Allow from all

-        </IfVersion>

-    </Directory>

 </VirtualHost>

-Alias /identity %PUBLICWSGI%

+Alias /identity %KEYSTONE_BIN%/keystone-wsgi-public

 <Location /identity>

     SetHandler wsgi-script

     Options +ExecCGI

@@ -64,7 +54,7 @@ Alias /identity %PUBLICWSGI%

     WSGIPassAuthorization On

 </Location>

-Alias /identity_admin %ADMINWSGI%

+Alias /identity_admin %KEYSTONE_BIN%/keystone-wsgi-admin

 <Location /identity_admin>

     SetHandler wsgi-script

     Options +ExecCGI