From 77613f456caf80335528fccad4d1c63d8f8546a8 Mon Sep 17 00:00:00 2001 From: szaimen Date: Mon, 31 Oct 2022 11:49:37 +0100 Subject: [PATCH] Make sure that the sites are really gone Signed-off-by: szaimen --- Containers/apache/Dockerfile | 4 ++++ Containers/mastercontainer/Dockerfile | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile index b898be2b..2abf26ef 100644 --- a/Containers/apache/Dockerfile +++ b/Containers/apache/Dockerfile @@ -46,6 +46,10 @@ RUN rm /etc/apache2/ports.conf; \ RUN set -ex; \ a2dissite 000-default && \ a2dissite default-ssl && \ + rm -f /etc/apache2/sites-enabled/000-default.conf && \ + rm -f /etc/apache2/sites-enabled/default-ssl.conf && \ + rm /etc/apache2/sites-available/000-default.conf && \ + rm /etc/apache2/sites-available/default-ssl.conf && \ a2ensite nextcloud.conf && \ rm -rf /var/www/html/* && \ chown www-data:www-data -R /var/log/apache2; \ diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index cb0554d7..64f1c9b7 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -76,8 +76,13 @@ RUN rm /etc/apache2/ports.conf; \ sed -s -i -e "s/Include ports.conf//" /etc/apache2/apache2.conf; \ sed -i "/^Listen /d" /etc/apache2/apache2.conf -RUN a2dissite 000-default && \ +RUN set -ex; \ + a2dissite 000-default && \ a2dissite default-ssl && \ + rm -f /etc/apache2/sites-enabled/000-default.conf && \ + rm -f /etc/apache2/sites-enabled/default-ssl.conf && \ + rm /etc/apache2/sites-available/000-default.conf && \ + rm /etc/apache2/sites-available/default-ssl.conf && \ a2ensite mastercontainer.conf RUN mkdir /var/log/supervisord; \