diff options
| author | elijah <elijah@riseup.net> | 2016-08-31 14:54:46 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-09-01 10:49:22 -0700 |
| commit | 8116e007cfd4dbee8282247348cf45473dcde45e (patch) | |
| tree | ecf8cfbc790ef57c3519c947a1fa76d0c1a4e5a2 /puppet/modules/site_config | |
| parent | d679399af0898b959b8b84a8e8d1e2e03c4e21b5 (diff) | |
added support for Let's Encrypt
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/x509/commercial/ca.pp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/x509/commercial/ca.pp b/puppet/modules/site_config/manifests/x509/commercial/ca.pp index c76a9dbb..21d57445 100644 --- a/puppet/modules/site_config/manifests/x509/commercial/ca.pp +++ b/puppet/modules/site_config/manifests/x509/commercial/ca.pp @@ -5,7 +5,13 @@ class site_config::x509::commercial::ca { $x509 = hiera('x509') $ca = $x509['commercial_ca_cert'] - x509::ca { $site_config::params::commercial_ca_name: - content => $ca + # + # CA cert might be empty, if it was bundled with 'commercial_cert' + # instead of specified separately. + # + if ($ca) { + x509::ca { $site_config::params::commercial_ca_name: + content => $ca + } } } |