diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 20:05:22 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 20:05:22 +0000 |
| commit | de59a377f223f4ea7e40261d34385e93b5745244 (patch) | |
| tree | 5aaa758144722156e6c5df7aed721052f1d469ac | |
| parent | 8a13d6a0169337e7d2877121f93b85eb8fa58cda (diff) | |
| download | puppet-de59a377f223f4ea7e40261d34385e93b5745244.tar puppet-de59a377f223f4ea7e40261d34385e93b5745244.tar.gz puppet-de59a377f223f4ea7e40261d34385e93b5745244.tar.bz2 puppet-de59a377f223f4ea7e40261d34385e93b5745244.tar.xz puppet-de59a377f223f4ea7e40261d34385e93b5745244.zip | |
don't generate self signed certificate if wildcard certificate available
| -rw-r--r-- | modules/apache/manifests/init.pp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index 58fd0b5d..9bbeaa6a 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -140,10 +140,12 @@ class apache { if $use_ssl { include apache::mod_ssl - openssl::self_signed_cert{ "$real_vhost": - directory => "/etc/ssl/apache/", - before => File["$filename"], - } + if ! $wildcard_sslcert { + openssl::self_signed_cert{ "$real_vhost": + directory => "/etc/ssl/apache/", + before => File["$filename"], + } + } } if $enable_public_html { |