summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-19 11:51:43 +0200
committervarac <varacanero@zeromail.org>2013-09-19 11:51:43 +0200
commite2ea69580ff9417efb7a85e8190d331051323ff3 (patch)
tree3e67e75e932d683084863c5bae5981ed17c98964 /puppet/modules/site_config
parentca3f34da520ff835d383aa82f528adf927d3364f (diff)
parent1f9003eb6ed90400279011d477e6143e2eb6e2db (diff)
Merge branch 'feature/3832_Unify_x509_certs,_keys_and_ca' into develop
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/params.pp6
-rw-r--r--puppet/modules/site_config/manifests/x509.pp9
2 files changed, 13 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp
index a4657457..008a4e1f 100644
--- a/puppet/modules/site_config/manifests/params.pp
+++ b/puppet/modules/site_config/manifests/params.pp
@@ -23,6 +23,8 @@ 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'
+ $client_ca_name = 'leap_client_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..8eca97e7 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,12 @@ class site_config::x509 {
x509::ca { $site_config::params::ca_name:
content => $ca
}
+
+ x509::ca { $site_config::params::client_ca_name:
+ content => $client_ca
+ }
+
+ x509::ca { $site_config::params::ca_bundle_name:
+ content => "${ca}${client_ca}"
+ }
}