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

ssl: also support the SSLCertificateChainFile required by some providers

Browse Source
This commit is contained in:
Jonathan Ballet 2015-06-09 11:54:07 +02:00
parent c9d9d954de
commit a8f2d89995
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache/vhosts/standard.tmpl
View File

@ -54,6 +54,9 @@
{% if site.get('SSLCertificateKeyFile') %} {% if site.get('SSLCertificateKeyFile') %}
SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }} SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}
{% endif %} {% endif %}
{% if site.get('SSLCertificateChainFile') %}
SSLCertificateChainFile {{ site.SSLCertificateChainFile}}
{% endif %}
{% endif %} {% endif %}
{% for path, dir in site.get('Directory', {}).items() %} {% for path, dir in site.get('Directory', {}).items() %}

1
pillar.example
View File

@ -46,6 +46,7 @@ apache:
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
SSLCertificateChainFile: /etc/ssl/mycert.chain.pem # if you require a chain of server certificates 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``