diff options
| author |   asteroide <thomas.duval@orange.com> | 2015-09-01 16:03:26 +0200 |
|---|---|---|
| committer | asteroide <thomas.duval@orange.com> | 2015-09-01 16:04:53 +0200 |
| commit | 92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 (patch) | |
| tree | 7ba22297042019e7363fa1d4ad26d1c32c5908c6 /keystone-moon/httpd | |
| parent | 26e753254f3e43399cc76e62892908b7742415e8 (diff) | |
Update Keystone code from official Github repository with branch Master on 09/01/2015.
Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498
Diffstat (limited to 'keystone-moon/httpd')
| -rw-r--r-- | keystone-moon/httpd/README | 2 | ||||
| -rw-r--r-- | keystone-moon/httpd/wsgi-keystone.conf | 28 |
2 files changed, 25 insertions, 5 deletions
diff --git a/keystone-moon/httpd/README b/keystone-moon/httpd/README index c4f5a800..35a32fc0 100644 --- a/keystone-moon/httpd/README +++ b/keystone-moon/httpd/README @@ -1,2 +1,2 @@ -Documentation how to set up Keystone to run with Apache HTTPD is in +Documentation for running Keystone with Apache HTTPD is in doc/source/apache-httpd.rst diff --git a/keystone-moon/httpd/wsgi-keystone.conf b/keystone-moon/httpd/wsgi-keystone.conf index f191818f..c2224d42 100644 --- a/keystone-moon/httpd/wsgi-keystone.conf +++ b/keystone-moon/httpd/wsgi-keystone.conf @@ -2,9 +2,9 @@ Listen 5000 Listen 35357 <VirtualHost *:5000> - WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone display-name=%{GROUP} + WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} WSGIProcessGroup keystone-public - WSGIScriptAlias / /var/www/cgi-bin/keystone/main + WSGIScriptAlias / /usr/local/bin/keystone-wsgi-public WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On <IfVersion >= 2.4> @@ -12,12 +12,22 @@ Listen 35357 </IfVersion> ErrorLog /var/log/apache2/keystone.log CustomLog /var/log/apache2/keystone_access.log combined + + <Directory /usr/local/bin> + <IfVersion >= 2.4> + Require all granted + </IfVersion> + <IfVersion < 2.4> + Order allow,deny + Allow from all + </IfVersion> + </Directory> </VirtualHost> <VirtualHost *:35357> - WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone display-name=%{GROUP} + WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} WSGIProcessGroup keystone-admin - WSGIScriptAlias / /var/www/cgi-bin/keystone/admin + WSGIScriptAlias / /usr/local/bin/keystone-wsgi-admin WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On <IfVersion >= 2.4> @@ -25,4 +35,14 @@ Listen 35357 </IfVersion> ErrorLog /var/log/apache2/keystone.log CustomLog /var/log/apache2/keystone_access.log combined + + <Directory /usr/local/bin> + <IfVersion >= 2.4> + Require all granted + </IfVersion> + <IfVersion < 2.4> + Order allow,deny + Allow from all + </IfVersion> + </Directory> </VirtualHost> |