From 143184021c575e8d9ad61245b217cadd2b4f4c6b Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 23 Jun 2018 17:14:31 +0200 Subject: [PATCH 1/4] Upgrade vhost-gen version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e35f0ee..d9ff3b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER "cytopia" ### ### Build arguments ### -ARG VHOST_GEN_GIT_REF=0.5 +ARG VHOST_GEN_GIT_REF=0.6 ARG CERT_GEN_GIT_REF=0.2 ENV BUILD_DEPS \ From d754dfb41efbc513506bb9a196c30e60e8c91072 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 23 Jun 2018 17:15:26 +0200 Subject: [PATCH 2/4] Do not upgrade local files to prevent httpd upgrade --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d9ff3b3..39122be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,6 @@ ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop" # required packages RUN set -x \ && apt-get update \ - && apt-get upgrade -y \ && apt-get install --no-install-recommends --no-install-suggests -y \ ${BUILD_DEPS} \ ${RUN_DEPS} \ From 3285b7b652f342cf79846474b9b8c2529855868e Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 23 Jun 2018 18:00:23 +0200 Subject: [PATCH 3/4] Upgrade vhost-gen configuration --- data/vhost-gen/main.yml | 3 +++ data/vhost-gen/mass.yml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/data/vhost-gen/main.yml b/data/vhost-gen/main.yml index 198c3e1..69b2b1f 100644 --- a/data/vhost-gen/main.yml +++ b/data/vhost-gen/main.yml @@ -87,6 +87,9 @@ vhost: # to prepend another subdirectory here. docroot: suffix: + # Array of indecies to serve as default files (e.g.: index.php, index.html, etc) + index: + - index.php # SSL Definition ssl: dir_crt: /etc/httpd/cert/main diff --git a/data/vhost-gen/mass.yml b/data/vhost-gen/mass.yml index 1b2c371..5c9efda 100644 --- a/data/vhost-gen/mass.yml +++ b/data/vhost-gen/mass.yml @@ -87,6 +87,11 @@ vhost: # to prepend another subdirectory here. docroot: suffix: __DOCROOT_SUFFIX__ + # Array of indecies to serve as default files (e.g.: index.php, index.html, etc) + index: + - index.php + - index.html + - index.htm # SSL Definition ssl: dir_crt: /etc/httpd/cert/mass From 1d4dc20403db91aa8bb05faf4fdbf118563c308c Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 23 Jun 2018 19:21:34 +0200 Subject: [PATCH 4/4] Use latest vhost-gen version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 39122be..51702ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER "cytopia" ### ### Build arguments ### -ARG VHOST_GEN_GIT_REF=0.6 +ARG VHOST_GEN_GIT_REF=0.7 ARG CERT_GEN_GIT_REF=0.2 ENV BUILD_DEPS \