From dd8e1cb2eee2d0f767985425985c445743d04189 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Fri, 4 Mar 2016 02:56:06 +0000 Subject: Fix horizon with ssl Ubuntu did not have mod_headers enabled by default Remove unused variable and adjust 'when' conditional positioning TrivialFix Change-Id: I82b8724526c24f4481a80165520d624f6a02c336 --- docker/horizon/Dockerfile.j2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 03a8dcb1b..f1e8e4f3c 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -26,7 +26,9 @@ RUN apt-get install -y --no-install-recommends \ openstack-dashboard \ apache2 \ libapache2-mod-wsgi \ - && apt-get clean + && echo > /etc/apache2/ports.conf \ + && apt-get clean \ + && ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \ && sed -i "s|WEBROOT='/horizon/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings.py \ @@ -34,7 +36,6 @@ RUN cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/opens && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ && /usr/bin/python /usr/bin/manage.py collectstatic --noinput \ && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \ - && echo "" > /etc/apache2/ports.conf \ && rm /etc/openstack-dashboard/local_settings.py \ && rm /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \ && ln -s /etc/openstack-dashboard/local_settings /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \ @@ -57,7 +58,8 @@ RUN apt-get install -y --no-install-recommends \ apache2 \ libapache2-mod-wsgi \ && echo > /etc/apache2/ports.conf \ - && apt-get clean + && apt-get clean \ + && ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load {% endif %} -- cgit v1.2.3