From d5333a311a8bb87c1821bf7e228cfebb6cf9a8b0 Mon Sep 17 00:00:00 2001 From: Mar Alegre Date: Fri, 26 Aug 2022 11:01:45 -0400 Subject: [PATCH 1/2] fix default apache site not being removed --- startpage/Containerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/startpage/Containerfile b/startpage/Containerfile index 052a717..434bee8 100644 --- a/startpage/Containerfile +++ b/startpage/Containerfile @@ -36,9 +36,8 @@ RUN usermod --uid $FILESUID www-data && \ RUN a2enmod php${PHPV:?} # copy site config -COPY assets/site.conf /etc/apache2/sites-available/ -WORKDIR /etc/apache2/sites-enabled -RUN rm 000-default.conf && ln -s ../sites-available/site.conf +COPY assets/site.conf /etc/apache2/sites-available/startpage.conf +RUN a2dissite 000-default && a2ensite startpage ### ### browserStartpage From 533e6cbab4c979607013c2068fd98823384bd8bc Mon Sep 17 00:00:00 2001 From: Mar Alegre Date: Fri, 26 Aug 2022 11:02:50 -0400 Subject: [PATCH 2/2] fix default apache site not being removed --- nextcloud/Containerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile index 17fc5e5..8c203fb 100644 --- a/nextcloud/Containerfile +++ b/nextcloud/Containerfile @@ -78,8 +78,7 @@ RUN a2enmod rewrite headers env dir mime proxy_fcgi && \ # copy site config COPY assets/apache/nextcloud.conf /etc/apache2/sites-available/ -WORKDIR /etc/apache2/sites-enabled -RUN rm 000-default.conf && ln -s ../sites-available/nextcloud.conf +RUN a2dissite 000-default && a2ensite nextcloud ### ### Redis