saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect syntax in pillar example for SSLCertificateFile, SSLCertificateKeyFile

Browse Source 
Fix check for SSLCertificateFile, SSLCertificateKeyFile variables in vhosts/standard.tmpl, now using dict.get()
This commit is contained in:
Mosen 2015-05-14 12:38:27 +10:00
parent 3ed48e04c6
commit f135e2e0d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/vhosts/standard.tmpl
View File

@ -48,10 +48,10 @@
{% 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 %} {% if site.get('SSLCertificateFile') != False %}
SSLEngine on SSLEngine on
SSLCertificateFile {{ site.SSLCertificateFile }} SSLCertificateFile {{ site.SSLCertificateFile }}
{% if site.SSLCertificateKeyFile is defined %} {% if site.get('SSLCertificateKeyFile') != False %}
SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }} SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}
{% endif %} {% endif %}
{% endif %} {% endif %}

4
pillar.example
View File

@ -44,8 +44,8 @@ apache:
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 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 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``