From 8732afe2f92545f2b9956c37bdfca4ee1bc07cae Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Mon, 22 Sep 2014 19:04:05 +0200 Subject: [PATCH] Use correct WSGI dir on SUSE distros The current default (/var/www) leads to: AH01797: client denied by server configuration: /var/www/keystone/admin For /var/www the needed permissions on SUSE are not set. For /srv/www/htdocs/ the permissions are correct on SUSE systems. Change-Id: I3f2df896daecdfe510d45ff121af2a8433a4d5be --- lib/keystone | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/keystone b/lib/keystone index b6a4e1097a..3998be9061 100644 --- a/lib/keystone +++ b/lib/keystone @@ -38,7 +38,11 @@ KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone} KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini} KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone} -KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone} +if is_suse; then + KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/srv/www/htdocs/keystone} +else + KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone} +fi KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware KEYSTONECLIENT_DIR=$DEST/python-keystoneclient