Browse Source

Merge pull request #52 from daschatten/master

Add basic SSL functionality.
tags/v0.37.4
Forrest 9 years ago
parent
commit
99ea682cfb
2 changed files with 11 additions and 0 deletions
  1. +8
    -0
      apache/vhosts/standard.tmpl
  2. +3
    -0
      pillar.example

+ 8
- 0
apache/vhosts/standard.tmpl View File

{% if site.get('DocumentRoot') != False %}DocumentRoot {{ vals.DocumentRoot }}{% endif %} {% if site.get('DocumentRoot') != False %}DocumentRoot {{ vals.DocumentRoot }}{% endif %}
{% if site.get('VirtualDocumentRoot') %}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% 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() %} {% for path, dir in site.get('Directory', {}).items() %}
{% set dvals = { {% set dvals = {
'Options': dir.get('Options', vals.Directory.Options), 'Options': dir.get('Options', vals.Directory.Options),

+ 3
- 0
pillar.example View File



DocumentRoot: /path/to/www/dir/example.com # E.g., /var/www/example.com 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: Directory:
# "default" is a special case; Adds ``/path/to/www/dir/example.com`` # "default" is a special case; Adds ``/path/to/www/dir/example.com``
# E.g.: /var/www/example.com # E.g.: /var/www/example.com

Loading…
Cancel
Save