Fix check for SSLCertificateFile, SSLCertificateKeyFile variables in vhosts/standard.tmpl, now using dict.get()master
@@ -48,10 +48,10 @@ | |||
{% if site.get('DocumentRoot') != False %}DocumentRoot {{ vals.DocumentRoot }}{% endif %} | |||
{% if site.get('VirtualDocumentRoot') %}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %} | |||
{% if site.SSLCertificateFile is defined %} | |||
{% if site.get('SSLCertificateFile') != False %} | |||
SSLEngine on | |||
SSLCertificateFile {{ site.SSLCertificateFile }} | |||
{% if site.SSLCertificateKeyFile is defined %} | |||
{% if site.get('SSLCertificateKeyFile') != False %} | |||
SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }} | |||
{% endif %} | |||
{% endif %} |
@@ -44,8 +44,8 @@ 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 | |||
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`` |