From 9e3645c53c49d2072c2e92ecdd24b386a04b539c Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Fri, 6 Jan 2017 19:02:18 +0100 Subject: [PATCH] FreeBSD: made default SSL key configurable --- apache/files/FreeBSD/mod_ssl.conf.jinja | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/files/FreeBSD/mod_ssl.conf.jinja b/apache/files/FreeBSD/mod_ssl.conf.jinja index dad5f59..3e76ea7 100644 --- a/apache/files/FreeBSD/mod_ssl.conf.jinja +++ b/apache/files/FreeBSD/mod_ssl.conf.jinja @@ -91,8 +91,8 @@ SSLOptions +StrictRequire # /usr/share/doc/apache2.2-common/README.Debian.gz for more info. # If both key and certificate are stored in the same file, only the # SSLCertificateFile directive is needed. -SSLCertificateFile /usr/local/etc/apache24/ssl/apache2-cert.pem -SSLCertificateKeyFile /usr/local/etc/apache24/ssl/apache2-key.pem +SSLCertificateFile {{ salt['pillar.get']('apache:ssl:default_cert', '/usr/local/etc/apache24/server.crt') }} +SSLCertificateKeyFile {{ salt['pillar.get']('apache:ssl:default_key', '/usr/local/etc/apache24/server.key') }} # Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the