diff options
| author | Zuul <zuul@review.opendev.org> | 2021-06-07 12:29:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-06-07 12:29:02 +0000 |
| commit | c5efc1cdb6c3abba8478909f537b816c911ffc05 (patch) | |
| tree | dec119e25640a76818af7b4cc023fe2dee3ec682 /docker | |
| parent | 53434625f64196529502bbeef618620b6267b0e0 (diff) | |
| parent | 740448a658f0060b86d56e78915d8b751ade3616 (diff) | |
| download | kolla-c5efc1cdb6c3abba8478909f537b816c911ffc05.tar.gz kolla-c5efc1cdb6c3abba8478909f537b816c911ffc05.zip | |
Merge "Add missing default policy files for ubuntu-binary-horizon"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 1b1a09078..ca3d726d1 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -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/expires.load /etc/apache2/mods-enabled/expires.load \ {% 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 \ {% else %} && cp /etc/openstack-dashboard/policy/*.json /etc/openstack-dashboard \ |