Browse code

Merge "Use correct WSGI dir on SUSE distros"

Jenkins authored on 2014/09/25 18:41:56
Showing 1 changed files
... ...
@@ -38,7 +38,11 @@ KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone}
38 38
 KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf
39 39
 KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini}
40 40
 KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone}
41
-KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone}
41
+if is_suse; then
42
+    KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/srv/www/htdocs/keystone}
43
+else
44
+    KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone}
45
+fi
42 46
 
43 47
 KEYSTONEMIDDLEWARE_DIR=$DEST/keystonemiddleware
44 48
 KEYSTONECLIENT_DIR=$DEST/python-keystoneclient