Merge "Add missing default policy files for ubuntu-binary-horizon"

This commit is contained in:
Zuul 2021-06-07 12:29:02 +00:00 committed by Gerrit Code Review
commit c5efc1cdb6

View File

@ -80,7 +80,7 @@ RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load \ && ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load \
&& ln -s ../mods-available/expires.load /etc/apache2/mods-enabled/expires.load \ && ln -s ../mods-available/expires.load /etc/apache2/mods-enabled/expires.load \
{% if base_distro == 'ubuntu' %} {% if base_distro == 'ubuntu' %}
&& cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \ && cp -r /usr/share/openstack-dashboard/openstack_dashboard/conf/* /etc/openstack-dashboard \
&& rm /etc/apache2/conf-enabled/openstack-dashboard.conf \ && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
{% else %} {% else %}
&& cp /etc/openstack-dashboard/policy/*.json /etc/openstack-dashboard \ && cp /etc/openstack-dashboard/policy/*.json /etc/openstack-dashboard \