diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 23:38:55 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 23:38:55 +0000 |
| commit | ef9df57ec73f67fcef34be8a7ab047c8255c42f2 (patch) | |
| tree | 11effedad4dfbd921269e6f4fcefe8df5eee94b2 /modules/apache | |
| parent | 5aee61786e0828d579a7cae4c632ffb9921e8116 (diff) | |
| download | puppet-ef9df57ec73f67fcef34be8a7ab047c8255c42f2.tar puppet-ef9df57ec73f67fcef34be8a7ab047c8255c42f2.tar.gz puppet-ef9df57ec73f67fcef34be8a7ab047c8255c42f2.tar.bz2 puppet-ef9df57ec73f67fcef34be8a7ab047c8255c42f2.tar.xz puppet-ef9df57ec73f67fcef34be8a7ab047c8255c42f2.zip | |
fix test on wildcard_sslcert
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/templates/01_default_ssl_vhost.conf | 2 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/apache/templates/01_default_ssl_vhost.conf b/modules/apache/templates/01_default_ssl_vhost.conf index bbf12df9..33424e6c 100644 --- a/modules/apache/templates/01_default_ssl_vhost.conf +++ b/modules/apache/templates/01_default_ssl_vhost.conf @@ -36,7 +36,7 @@ SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW # connect. Disable SSLv2 access by default: SSLProtocol all -SSLv2 -<%- if wildcard_sslcert then -%> +<%- if wildcard_sslcert == true then -%> SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf index 807a2a47..4636f1bc 100644 --- a/modules/apache/templates/vhost_base.conf +++ b/modules/apache/templates/vhost_base.conf @@ -8,7 +8,7 @@ end <VirtualHost *:<%= port %>> <%- if use_ssl then -%> SSLEngine on - <%- if wildcard_sslcert then -%> + <%- if wildcard_sslcert == true then -%> SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem |