summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-13 15:55:09 +0200
committervarac <varacanero@zeromail.org>2013-09-13 15:55:29 +0200
commit3a9569ca027dccef87509323f08407e60039d9a9 (patch)
tree6d3e8688570cc5d94b84debc4759f4dd248315d5 /puppet/modules/site_config/manifests/default.pp
parenta6c19295e276da865f6c66963ed761d3ebc7dc99 (diff)
Deploy default x509 cert + key that services can use (Feature #3836)
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r--puppet/modules/site_config/manifests/default.pp13
1 files changed, 2 insertions, 11 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index dd0d37f7..b315044a 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -55,15 +55,6 @@ class site_config::default {
include site_squid_deb_proxy::client
}
- # Set up leap ca
- $x509 = hiera('x509')
- $ca = $x509['ca_cert']
- $ca_name = 'leap_ca'
-
- x509::ca { $ca_name:
- content => $ca,
- before => [
- Class['Site_openvpn::Keys'],
- Class['Site_stunnel'] ]
- }
+ include site_config::x509
+
}