diff options
| author | varac <varacanero@zeromail.org> | 2013-09-17 19:11:39 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-18 17:44:20 +0200 |
| commit | bdfef97e49f17c74158084e10e7d0121cc70dd42 (patch) | |
| tree | e26e697c75da496ca892f1868c3607f858280f7d /puppet/modules/site_config | |
| parent | ca3f34da520ff835d383aa82f528adf927d3364f (diff) | |
openvpn should use /usr/local/share/ca-certificates/leap_ca.crt (Feature #3831)
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/params.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/x509.pp | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp index a4657457..b434af90 100644 --- a/puppet/modules/site_config/manifests/params.pp +++ b/puppet/modules/site_config/manifests/params.pp @@ -23,6 +23,7 @@ class site_config::params { fail("unable to determine a valid interface, please set a valid interface for this node in nodes/${::hostname}.json") } - $ca_name = 'leap_ca' - $cert_name = 'leap' + $ca_name = 'leap_ca' + $ca_bundle_name = 'leap_ca_bundle' + $cert_name = 'leap' } diff --git a/puppet/modules/site_config/manifests/x509.pp b/puppet/modules/site_config/manifests/x509.pp index 879285dd..2660c523 100644 --- a/puppet/modules/site_config/manifests/x509.pp +++ b/puppet/modules/site_config/manifests/x509.pp @@ -4,6 +4,7 @@ class site_config::x509 { $key = $x509['key'] $cert = $x509['cert'] $ca = $x509['ca_cert'] + $client_ca = $x509['client_ca_cert'] x509::key { $site_config::params::cert_name: content => $key @@ -16,4 +17,8 @@ class site_config::x509 { x509::ca { $site_config::params::ca_name: content => $ca } + + x509::ca { $site_config::params::ca_bundle_name: + content => "${ca}${client_ca}" + } } |