15-fix-static-root-setting.patch revision 6033
6033N/APatch to correct where STATIC_ROOT is set. This has been fixed
6033N/Aupstream under https://bugs.launchpad.net/horizon/+bug/1399585 but not
6033N/Ayet backported to Kilo.
6033N/A
6033N/A--- horizon-2015.1.0/openstack_dashboard/settings.py.orig 2015-07-30 13:43:47.751455772 -0600
6033N/A+++ horizon-2015.1.0/openstack_dashboard/settings.py 2015-07-30 13:45:34.900930381 -0600
6033N/A@@ -258,6 +258,10 @@ ADD_INSTALLED_APPS = []
6033N/A # It can be overridden in local_settings.py
6033N/A CUSTOM_THEME_PATH = 'static/themes/default'
6033N/A
6033N/A+# Set these before importing local_settings in case they are set there
6033N/A+MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
6033N/A+STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
6033N/A+
6033N/A try:
6033N/A from local.local_settings import * # noqa
6033N/A except ImportError:
6033N/A@@ -272,9 +276,7 @@ if LOGOUT_URL is None:
6033N/A if LOGIN_REDIRECT_URL is None:
6033N/A LOGIN_REDIRECT_URL = WEBROOT
6033N/A
6033N/A-MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
6033N/A MEDIA_URL = WEBROOT + 'media/'
6033N/A-STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
6033N/A STATIC_URL = WEBROOT + 'static/'
6033N/A STATICFILES_DIRS = get_staticfiles_dirs(WEBROOT)
6033N/A