Merge pull request brettt89#45 from brettt89/hotfix/apache-template

Update bad variable in Apache template
josephlewisnz · Aug 10, 2020 · ffd6742 · ffd6742
2 parents 9b330e3 + fb84f35
commit ffd6742
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/5.6/apache/jessie/Dockerfile b/5.6/apache/jessie/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/5.6/apache/stretch/Dockerfile b/5.6/apache/stretch/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.1/apache/buster/Dockerfile b/7.1/apache/buster/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.1/apache/jessie/Dockerfile b/7.1/apache/jessie/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.1/apache/stretch/Dockerfile b/7.1/apache/stretch/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.2/apache/buster/Dockerfile b/7.2/apache/buster/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.2/apache/stretch/Dockerfile b/7.2/apache/stretch/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.3/apache/buster/Dockerfile b/7.3/apache/buster/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.3/apache/stretch/Dockerfile b/7.3/apache/stretch/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/7.4/apache/buster/Dockerfile b/7.4/apache/buster/Dockerfile
@@ -31,7 +31,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \

diff --git a/src/debian/Dockerfile.apache.tpl b/src/debian/Dockerfile.apache.tpl
@@ -5,7 +5,7 @@ RUN { \
                 echo '  DocumentRoot ${DOCUMENT_ROOT}'; \
                 echo '  LogLevel warn'; \
                 echo '  ServerSignature Off'; \
-                echo '  <Directory ${ENVVAR}>'; \
+                echo '  <Directory ${DOCUMENT_ROOT}>'; \
                 echo '    Options +FollowSymLinks'; \
                 echo '    Options -ExecCGI -Includes -Indexes'; \
                 echo '    AllowOverride all'; \