fixing apache document root in *conf

Author: Julien Neuhart

Dockerfile.10-apache

@@ -88,9 +88,6 @@ RUN set -ex \
 
 ENV APACHE_DOCUMENT_ROOT /
 
-RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
 RUN { \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.html'; \
@@ -102,6 +99,9 @@ RUN { \
 	} | tee "$APACHE_CONFDIR/conf-available/nodejs.conf" \
 	&& a2enconf nodejs
 
+RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
 # |--------------------------------------------------------------------------
 # | Apache mod_rewrite
 # |--------------------------------------------------------------------------

Dockerfile.6-apache

@@ -88,9 +88,6 @@ RUN set -ex \
 
 ENV APACHE_DOCUMENT_ROOT /
 
-RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
 RUN { \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.html'; \
@@ -102,6 +99,9 @@ RUN { \
 	} | tee "$APACHE_CONFDIR/conf-available/nodejs.conf" \
 	&& a2enconf nodejs
 
+RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
 # |--------------------------------------------------------------------------
 # | Apache mod_rewrite
 # |--------------------------------------------------------------------------

Dockerfile.8-apache

@@ -88,9 +88,6 @@ RUN set -ex \
 
 ENV APACHE_DOCUMENT_ROOT /
 
-RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
 RUN { \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.html'; \
@@ -102,6 +99,9 @@ RUN { \
 	} | tee "$APACHE_CONFDIR/conf-available/nodejs.conf" \
 	&& a2enconf nodejs
 
+RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
 # |--------------------------------------------------------------------------
 # | Apache mod_rewrite
 # |--------------------------------------------------------------------------

utils/Dockerfile.blueprint

@@ -91,9 +91,6 @@ RUN set -ex \
 
 ENV APACHE_DOCUMENT_ROOT /
 
-RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
-RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
-
 RUN { \
 		echo 'DirectoryIndex disabled'; \
 		echo 'DirectoryIndex index.html'; \
@@ -105,6 +102,9 @@ RUN { \
 	} | tee "$APACHE_CONFDIR/conf-available/nodejs.conf" \
 	&& a2enconf nodejs
 
+RUN sed -ri -e 's!/var/www/html!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!/var/www/html/${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
 # |--------------------------------------------------------------------------
 # | Apache mod_rewrite
 # |--------------------------------------------------------------------------