From f9ee42cd7db5020fa08b9cd8cac1c9bfa2a94ff8 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 45cdb83..9a2c491 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 b29e7ed5ae3c486c8f249e9d8ee1dc08a208b1da 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 9a2c491..d43939d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,6 @@ ENV HTTPD_RELOAD="nginx -s 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 972e093f3826df4900590358661aafb1846af6f7 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 f079bcf..f73384d 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 da5f52b..63b6dd1 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 a97809f839eaed0fa864a5ec7f274ca1bc857e1b 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 d43939d..db738be 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 \