Merge pull request #31 from syphernl/feature/proxy_support

Proxy vhost support

.salt/pillar/vanilla-apache/overlay.sls

@@ -14,3 +14,11 @@ vhosting:
   server:
     webserver: apache
     webserver_edition: vanilla
+
+# Apache
+apache:
+  modules_enabled:
+    - ssl
+    - rewrite
+    - proxy
+    - proxy_http

.salt/pillar/zendserver-apache/overlay.sls

@@ -23,3 +23,11 @@ zendserver:
   # Which webserver to use, can either be apache or nginx
   webserver: apache
   bootstrap: False
+
+# Apache
+apache:
+  modules_enabled:
+    - ssl
+    - rewrite
+    - proxy
+    - proxy_http

README.md

@@ -12,7 +12,7 @@ but there is more…
 
 > **note**
 >
-> This formula has **only been tested on Ubuntu 14.04**.
+> This formula has **only been tested on Ubuntu 14.04/16.04**.
 >
 > :   It will most likely not work on other platforms due to hardcoded
 >     package names and Ubuntu-specific commands.

docs/configuration.md

@@ -78,7 +78,14 @@ The following keys can be defined:
 **redirect\_to**
 
 >   A string which will - if set - redirect the domain to the given URL
->    and uses the `redirect` vhost.
+>    and uses the `redirect` vhost template.
+
+> This may be used in conjunction with `ssl`
+
+**proxy\_pass**
+
+>   A string which will - if set - setup the webserver to proxy the domain to
+>    the given URL and uses the `proxy` vhost template.
 
 > This may be used in conjunction with `ssl`
 

pillar.example

@@ -39,6 +39,10 @@ vhosting:
           # This is a 'redirect vhost' which is just sending traffic to a different domain. Its vhost is very simple
           redirect_to: 'http://www.example.com'
 
+        proxyme.com:
+          # This is a 'proxy vhost' which is just sending traffic to a different domain but masks the destination
+          proxy_pass: 'http://www.example.com'
+
         #secured-site.com:
         #  # This vhost follows the defaults but does have forced SSL
         #  ssl:

vhosting/resources/vhost.sls

@@ -29,6 +29,9 @@
 {%- if 'redirect_to' in params %}
 # Redirect vhost, no need for directory structure etc
 {%- set template_file = params.get('template_file', vhost_template_path ~ '/redirect.conf.jinja') %}
+{%- elif 'proxy_pass' in params %}
+# Proxy vhost, no need for directory structure etc
+{%- set template_file = params.get('template_file', vhost_template_path ~ '/proxy.conf.jinja') %}
 {%- else %}
 # Normal vhost, required folders
 {%- set template_file = params.get('template_file', vhost_template_path ~ '/default.conf.jinja') %}