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

Merge pull request #58 from multani/proxy-ssl

Browse Source 
Add support for SSL certificates in the proxy template
This commit is contained in:
Forrest 2015-06-09 10:25:01 -07:00
commit e10003b077
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apache/vhosts/proxy.tmpl
View File

@ -34,6 +34,17 @@
{% if site.get('ErrorLog') != False %}ErrorLog {{ vals.ErrorLog }}{% endif %} {% if site.get('ErrorLog') != False %}ErrorLog {{ vals.ErrorLog }}{% endif %}
{% if site.get('CustomLog') != False %}CustomLog {{ vals.CustomLog }} {{ vals.LogFormat }}{% endif %} {% if site.get('CustomLog') != False %}CustomLog {{ vals.CustomLog }} {{ vals.LogFormat }}{% endif %}
{% if site.get('SSLCertificateFile') %}
SSLEngine on
SSLCertificateFile {{ site.SSLCertificateFile }}
{% if site.get('SSLCertificateKeyFile') %}
SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}
{% endif %}
{% if site.get('SSLCertificateChainFile') %}
SSLCertificateChainFile {{ site.SSLCertificateChainFile}}
{% endif %}
{% endif %}
ProxyPreserveHost {{ vals.ProxyPreserveHost }} ProxyPreserveHost {{ vals.ProxyPreserveHost }}
{% for proxy, proxyargs in vals.ProxyRoute|dictsort|reverse %} {% for proxy, proxyargs in vals.ProxyRoute|dictsort|reverse %}
{% set proxyvals = { {% set proxyvals = {

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``