summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-17 16:43:20 +0200
committervarac <varacanero@zeromail.org>2013-09-17 16:43:20 +0200
commit5f87fcd074480cdc448e23cb78386377cc19e90b (patch)
tree5dc28b574d01d5cb07f06640d142abf8da99dac0 /puppet/modules/site_config/manifests
parent70284fd0e786ad838fbbd40c816f6c0d01cc1629 (diff)
parent3e5e685200e9b5c3ac8567100e552929ea55d8e8 (diff)
Merge branch 'feature/3817_3836_3837_Duplicate_declarations' into develop
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/default.pp2
-rw-r--r--puppet/modules/site_config/manifests/params.pp3
-rw-r--r--puppet/modules/site_config/manifests/x509.pp19
3 files changed, 24 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 0a4e75b6..b315044a 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -55,4 +55,6 @@ class site_config::default {
include site_squid_deb_proxy::client
}
+ include site_config::x509
+
}
diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp
index 237ee454..20697042 100644
--- a/puppet/modules/site_config/manifests/params.pp
+++ b/puppet/modules/site_config/manifests/params.pp
@@ -22,4 +22,7 @@ class site_config::params {
else {
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'
}
diff --git a/puppet/modules/site_config/manifests/x509.pp b/puppet/modules/site_config/manifests/x509.pp
new file mode 100644
index 00000000..879285dd
--- /dev/null
+++ b/puppet/modules/site_config/manifests/x509.pp
@@ -0,0 +1,19 @@
+class site_config::x509 {
+
+ $x509 = hiera('x509')
+ $key = $x509['key']
+ $cert = $x509['cert']
+ $ca = $x509['ca_cert']
+
+ x509::key { $site_config::params::cert_name:
+ content => $key
+ }
+
+ x509::cert { $site_config::params::cert_name:
+ content => $cert
+ }
+
+ x509::ca { $site_config::params::ca_name:
+ content => $ca
+ }
+}