summaryrefslogtreecommitdiff
path: root/httpd
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2015-03-15 10:32:57 -0500
committerBrant Knudson <bknudson@us.ibm.com>2015-03-18 19:33:42 +0000
commit8aaaa64b176d21e525372a296d5d8d6085e5d26f (patch)
treec870d2dd5269f9a4cb694ef72099582561dc0e5f /httpd
parentfcfd8fc00aabf6cf24d86b1523bc953d5c0420ef (diff)
downloadkeystone-8aaaa64b176d21e525372a296d5d8d6085e5d26f.tar.gz
Update sample httpd config file
The sample httpd config file was not using best practices for apache configuration. The file is now a copy of the file that devstack uses for keystone apache config (files/apache-keystone.template), with the replacement strings updated to the keystone defaults. Also, the "Firewall" section is removed from the httpd config docs because the sample config file isn't using port 443. Change-Id: I1d10925b33ec7e70793e61db1cb99186f112ef3e
Diffstat (limited to 'httpd')
-rw-r--r--httpd/wsgi-keystone.conf32
1 files changed, 26 insertions, 6 deletions
diff --git a/httpd/wsgi-keystone.conf b/httpd/wsgi-keystone.conf
index d542a878a..f191818f6 100644
--- a/httpd/wsgi-keystone.conf
+++ b/httpd/wsgi-keystone.conf
@@ -1,8 +1,28 @@
-WSGIScriptAlias /keystone/main /var/www/cgi-bin/keystone/main
-WSGIScriptAlias /keystone/admin /var/www/cgi-bin/keystone/admin
+Listen 5000
+Listen 35357
-<Location "/keystone">
- NSSRequireSSL
- Authtype none
-</Location>
+<VirtualHost *:5000>
+ WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone display-name=%{GROUP}
+ WSGIProcessGroup keystone-public
+ WSGIScriptAlias / /var/www/cgi-bin/keystone/main
+ WSGIApplicationGroup %{GLOBAL}
+ WSGIPassAuthorization On
+ <IfVersion >= 2.4>
+ ErrorLogFormat "%{cu}t %M"
+ </IfVersion>
+ ErrorLog /var/log/apache2/keystone.log
+ CustomLog /var/log/apache2/keystone_access.log combined
+</VirtualHost>
+<VirtualHost *:35357>
+ WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone display-name=%{GROUP}
+ WSGIProcessGroup keystone-admin
+ WSGIScriptAlias / /var/www/cgi-bin/keystone/admin
+ WSGIApplicationGroup %{GLOBAL}
+ WSGIPassAuthorization On
+ <IfVersion >= 2.4>
+ ErrorLogFormat "%{cu}t %M"
+ </IfVersion>
+ ErrorLog /var/log/apache2/keystone.log
+ CustomLog /var/log/apache2/keystone_access.log combined
+</VirtualHost>