openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Fix the STATIC_ROOT after overwriting local_settings.py"

Browse Source
This commit is contained in:
Jenkins
2015-02-13 15:38:42 +00:00
committed by Gerrit Code Review
parent a9ea616fc9 e1efdc7835
commit bfee20d9d8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui
View File

@@ -13,6 +13,7 @@ else
LOCAL_SETTINGS_FILE=/etc/horizon/local_settings.py
DJANGO_ADMIN=django-admin
cp $LOCAL_SETTINGS_FILE /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
sed -i 's#^STATIC_ROOT.*#STATIC_ROOT = "'/usr/share/openstack-dashboard/static'"#' /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
fi
source /root/stackrc
@@ -73,7 +74,7 @@ if [ -n "${HORIZON_VENV_DIR:-}" ]; then
set -u
else
cp $LOCAL_SETTINGS_FILE /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
cp -r /var/www/horizon/static/dashboard/* /usr/share/openstack-dashboard/static/dashboard/
sed -i 's#^STATIC_ROOT.*#STATIC_ROOT = "'/usr/share/openstack-dashboard/static'"#' /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
fi
os-svc-enable -n apache2