Fix #144 Be able to use global vhost-gen templates

.gitignore

@@ -31,6 +31,11 @@
 # Ignore compose override file
 docker-compose.override.yml
 
+# Ignore custom global vhost gen templates
+/cfg/vhost-gen/apache22.conf
+/cfg/vhost-gen/apache24.conf
+/cfg/vhost-gen/nginx.conf
+
 # Ignore custom HTTPD configs
 /cfg/apache-2.2/*.conf
 /cfg/apache-2.4/*.conf

cfg/vhost-gen/README.md

@@ -0,0 +1,13 @@
+# Global vhost-gen configurations
+
+
+In order for template files to be picked up by the web server they must have the correct name.
+
+Copy the example templates to a new file with the correct name.
+
+| Web server     | Example template        | Template name  |
+|----------------|-------------------------|----------------|
+| Apache 2.2     |  `apache22.yml-example` | `apache22.yml` |
+| Apache 2.4     |  `apache24.yml-example` | `apache24.yml` |
+| Nginx stable   |  `nginx.yml-example`    | `nginx.yml`    |
+| Nginx mainline |  `nginx.yml-example`    | `nginx.yml`    |

docker-compose.yml

@@ -206,7 +206,7 @@ services:
   # Web Server
   # ------------------------------------------------------------
   httpd:
-    image: devilbox/${HTTPD_SERVER:-nginx-stable}:0.21
+    image: devilbox/${HTTPD_SERVER:-nginx-stable}:0.22
 
     environment:
 
@@ -281,6 +281,9 @@ services:
       # Mount custom web server config directory
       - ${DEVILBOX_PATH}/cfg/${HTTPD_SERVER}:/etc/httpd-custom.d
 
+      # Mount custom vhost-templates
+      - ${DEVILBOX_PATH}/cfg/vhost-gen:/etc/vhost-gen.d
+
       # Mount logs
       - ${DEVILBOX_PATH}/log/${HTTPD_SERVER}:/var/log/${HTTPD_SERVER}