Merge pull request 'fix apache default site not being removed' (#7) from bugfix/apache-defaultsite into master

Reviewed-on: #7

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 a2dissite 000-default && a2ensite nextcloud
-RUN rm 000-default.conf && ln -s ../sites-available/nextcloud.conf
 
 ###
 ### Redis

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/
+COPY assets/site.conf /etc/apache2/sites-available/startpage.conf
-WORKDIR /etc/apache2/sites-enabled
+RUN a2dissite 000-default && a2ensite startpage
-RUN rm 000-default.conf && ln -s ../sites-available/site.conf
 
 ###
 ### browserStartpage