aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-03-02 19:27:11 +0000
committerNicolas Vigier <boklm@mageia.org>2011-03-02 19:27:11 +0000
commit49730b620010a4683139911cf35b005f473758ca (patch)
tree66da2599d2d21059f8846e0faebba039e0245d91 /modules
parentd43f54cc6f28049c5b3d9d0c8549bbeb23b727ab (diff)
downloadpuppet-49730b620010a4683139911cf35b005f473758ca.tar
puppet-49730b620010a4683139911cf35b005f473758ca.tar.gz
puppet-49730b620010a4683139911cf35b005f473758ca.tar.bz2
puppet-49730b620010a4683139911cf35b005f473758ca.tar.xz
puppet-49730b620010a4683139911cf35b005f473758ca.zip
use wildcard certificate, if available
Diffstat (limited to 'modules')
-rw-r--r--modules/apache/templates/vhost_base.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf
index 974fd4f7..807a2a47 100644
--- a/modules/apache/templates/vhost_base.conf
+++ b/modules/apache/templates/vhost_base.conf
@@ -8,8 +8,15 @@ end
<VirtualHost *:<%= port %>>
<%- if use_ssl then -%>
SSLEngine on
+ <%- if wildcard_sslcert then -%>
+ SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt
+ SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key
+ SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem
+ SSLVerifyClient None
+ <%- else -%>
SSLCertificateFile /etc/ssl/apache/<%= real_vhost %>.pem
SSLCertificateKeyFile /etc/ssl/apache/<%= real_vhost %>.pem
+ <%- end -%>
<%- end -%>
ServerName <%= real_vhost %>
<%- server_aliases.each do |key| -%>