summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-12-10 23:16:27 +0100
committervarac <varacanero@zeromail.org>2012-12-10 23:16:27 +0100
commit3c52477a6c0cb4d4cc3caee2aea350acc51a5c8a (patch)
tree7e3c3b3a9557c7678737ab967b46089257e7f730 /puppet
parentc8dda5249aa146239dd681db98da2c273dd07d77 (diff)
also deploy ca_cert
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_ca_daemon/manifests/init.pp33
1 files changed, 19 insertions, 14 deletions
diff --git a/puppet/modules/site_ca_daemon/manifests/init.pp b/puppet/modules/site_ca_daemon/manifests/init.pp
index aa9219c1..db76e0fb 100644
--- a/puppet/modules/site_ca_daemon/manifests/init.pp
+++ b/puppet/modules/site_ca_daemon/manifests/init.pp
@@ -3,7 +3,7 @@ class site_ca_daemon {
#$definition_files = hiera('definition_files')
#$provider = $definition_files['provider']
#$eip_service = $definition_files['eip_service']
- $x509 = hiera('x509')
+ $x509 = hiera('x509')
Class[Ruby] -> Class[rubygems] -> Class[bundler::install]
@@ -29,17 +29,24 @@ class site_ca_daemon {
}
- x509::key {
- 'leap_ca_daemon':
- content => $x509['cert'],
- #notify => Service[apache];
- }
-
- x509::cert {
- 'leap_ca_daemon':
- content => $x509['key'],
- #notify => Service[apache];
- }
+ x509::key {
+ 'leap_ca_daemon':
+ content => $x509['key'],
+ #notify => Service[apache];
+ }
+
+ x509::cert {
+ 'leap_ca_daemon':
+ content => $x509['cert'],
+ #notify => Service[apache];
+ }
+
+ x509::ca {
+ 'leap_ca_daemon':
+ content => $x509['ca_cert'],
+ #notify => Service[apache];
+ }
+
file { '/srv/leap_ca_daemon':
ensure => directory,
@@ -66,6 +73,4 @@ class site_ca_daemon {
require => [ Class['bundler::install'], Vcsrepo['/srv/leap_ca_daemon'] ];
}
-
-
}