diff options
| author | varac <varacanero@zeromail.org> | 2013-09-24 22:51:04 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-24 22:51:04 +0200 |
| commit | c171b05d95aa814872b216b1c119db7eeb805809 (patch) | |
| tree | 7a5419163127f98f4108415453f21af617bad222 /puppet/modules/site_config | |
| parent | 372c2f96997f90ae9bfd6c3315e7244ce851c460 (diff) | |
| parent | 2aa2ab27860166b2846abbfd4ed2afc76576f714 (diff) | |
Merge branch 'feature/3917_openvpn_is_failing_to_connect' into develop
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/x509/client_ca/ca.pp (renamed from puppet/modules/site_config/manifests/x509/client_ca.pp) | 8 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/x509/client_ca/key.pp | 14 |
2 files changed, 18 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/x509/client_ca.pp b/puppet/modules/site_config/manifests/x509/client_ca/ca.pp index 3e914cf5..0f313898 100644 --- a/puppet/modules/site_config/manifests/x509/client_ca.pp +++ b/puppet/modules/site_config/manifests/x509/client_ca/ca.pp @@ -1,14 +1,14 @@ -class site_config::x509::client_ca { +class site_config::x509::client_ca::ca { ## ## This is for the special CA that is used exclusively for generating ## client certificates by the webapp. ## - $x509 = hiera('x509') - $client_ca = $x509['client_ca_cert'] + $x509 = hiera('x509') + $cert = $x509['client_ca_cert'] x509::ca { $site_config::params::client_ca_name: - content => $client_ca + content => $cert } } diff --git a/puppet/modules/site_config/manifests/x509/client_ca/key.pp b/puppet/modules/site_config/manifests/x509/client_ca/key.pp new file mode 100644 index 00000000..f9ef3f52 --- /dev/null +++ b/puppet/modules/site_config/manifests/x509/client_ca/key.pp @@ -0,0 +1,14 @@ +class site_config::x509::client_ca::key { + + ## + ## This is for the special CA that is used exclusively for generating + ## client certificates by the webapp. + ## + + $x509 = hiera('x509') + $key = $x509['client_ca_key'] + + x509::key { $site_config::params::client_ca_name: + content => $key + } +} |