Merge pull request #52 from daschatten/master

Add basic SSL functionality.

apache/vhosts/standard.tmpl

@@ -48,6 +48,14 @@
     {% if site.get('DocumentRoot') != False %}DocumentRoot {{ vals.DocumentRoot }}{% endif %}
     {% if site.get('VirtualDocumentRoot') %}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %}
 
+    {% if site.SSLCertificateFile is defined %}
+    SSLEngine on
+    SSLCertificateFile {{ site.SSLCertificateFile }}
+    {%   if site.SSLCertificateKeyFile is defined %}
+    SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}
+    {%   endif %}
+    {% endif %}
+
     {% for path, dir in site.get('Directory', {}).items() %}
     {% set dvals = {
         'Options': dir.get('Options', vals.Directory.Options),

pillar.example

@@ -44,6 +44,9 @@ apache:
 
       DocumentRoot: /path/to/www/dir/example.com # E.g., /var/www/example.com
 
+      SSLCertificateFile = /etc/ssl/mycert.pem # if ssl is desired
+      SSLCertificateKeyFile = /etc/ssl/mycert.pem.key # if key for cert is needed or in an extra file
+
       Directory:
         # "default" is a special case; Adds ``/path/to/www/dir/example.com``
         # E.g.: /var/www/example.com