Merge pull request #21 from devilbox/release-0.26

Update to latest vhost-gen version
devilbox · Jan 6, 2019 · 221a1f9 · 221a1f9
2 parents e338b71 + 997b20d
commit 221a1f9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ LABEL \
 ###
 ### Build arguments
 ###
-ARG VHOST_GEN_GIT_REF=0.12
+ARG VHOST_GEN_GIT_REF=0.13
 ARG CERT_GEN_GIT_REF=0.2
 
 ENV BUILD_DEPS \

diff --git a/README.md b/README.md
@@ -249,7 +249,7 @@ It offers pre-configured mass virtual hosts and an intranet.
 
 It allows any of the following combinations:
 
-* PHP 5.4, PHP 5.5, PHP 5.6, PHP 7.0, PHP 7.1 and HHVM
+* PHP 5.2, 5.3, 5.4, PHP 5.5, PHP 5.6, PHP 7.0, PHP 7.1, 7.2, 7.3 and 7.4
 * MySQL 5.5, MySQL 5.6, MySQL 5.7, MariaDB 5 and MariaDB 10
 * Apache 2.2, Apache 2.4, Nginx stable and Nginx mainline
 * And more to come...

diff --git a/data/vhost-gen/main.yml b/data/vhost-gen/main.yml
@@ -94,6 +94,7 @@ vhost:
     - index.htm
   # SSL Definition
   ssl:
+    http2: True
     dir_crt: /etc/httpd/cert/main
     dir_key: /etc/httpd/cert/main
     protocols: 'TLSv1 TLSv1.1 TLSv1.2'

diff --git a/data/vhost-gen/mass.yml b/data/vhost-gen/mass.yml
@@ -94,6 +94,7 @@ vhost:
     - index.htm
   # SSL Definition
   ssl:
+    http2: True
     dir_crt: /etc/httpd/cert/mass
     dir_key: /etc/httpd/cert/mass
     protocols: 'TLSv1 TLSv1.1 TLSv1.2'