diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 23:53:51 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 23:53:51 +0000 |
| commit | 0905b4dd042a84d93583d0a8757716e1035c96fe (patch) | |
| tree | b6b246ae7689ba9e88cf2bec1f57aed7d2a15e64 | |
| parent | 937ed680ef0d1a90cb73a9070561a4c9c92d5464 (diff) | |
| download | puppet-0905b4dd042a84d93583d0a8757716e1035c96fe.tar puppet-0905b4dd042a84d93583d0a8757716e1035c96fe.tar.gz puppet-0905b4dd042a84d93583d0a8757716e1035c96fe.tar.bz2 puppet-0905b4dd042a84d93583d0a8757716e1035c96fe.tar.xz puppet-0905b4dd042a84d93583d0a8757716e1035c96fe.zip | |
revert 1244
| -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 bc112845..0c4d1c29 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 == true then -%> +<%- if wildcard_sslcert 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 4636f1bc..807a2a47 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 == true then -%> + <%- if wildcard_sslcert then -%> SSLCertificateFile /etc/ssl/wildcard.<%= domain %>.crt SSLCertificateKeyFile /etc/ssl/wildcard.<%= domain %>.key SSLCACertificateFile /etc/ssl/wildcard.<%= domain %>.pem |