diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-03-03 00:43:20 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-03-03 00:43:20 +0000 |
| commit | 64aad297cebda3fd5fc1bf055e6d7ac9b94a816a (patch) | |
| tree | e649803101c5174e2ac8efad0b2c1044d2e58f2f /modules | |
| parent | 0905b4dd042a84d93583d0a8757716e1035c96fe (diff) | |
| download | puppet-64aad297cebda3fd5fc1bf055e6d7ac9b94a816a.tar puppet-64aad297cebda3fd5fc1bf055e6d7ac9b94a816a.tar.gz puppet-64aad297cebda3fd5fc1bf055e6d7ac9b94a816a.tar.bz2 puppet-64aad297cebda3fd5fc1bf055e6d7ac9b94a816a.tar.xz puppet-64aad297cebda3fd5fc1bf055e6d7ac9b94a816a.zip | |
test wildcard_sslcert as a string (as facter converts booleans to strings)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/apache/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/apache/templates/01_default_ssl_vhost.conf | 2 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_base.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index d528ebee..b9d2c94f 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -152,7 +152,7 @@ class apache { if $use_ssl { include apache::mod_ssl - if ! $wildcard_sslcert { + if $wildcard_sslcert != 'true' { openssl::self_signed_cert{ "$real_vhost": directory => "/etc/ssl/apache/", before => File["$filename"], diff --git a/modules/apache/templates/01_default_ssl_vhost.conf b/modules/apache/templates/01_default_ssl_vhost.conf index 0c4d1c29..d096c5db 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..4d3def50 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 |