From 1ce6cb5a30c5ee73d6474ac9c1bbd4c7819d9a73 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 19 Sep 2013 12:19:00 +0200
Subject: only deploy x509 stuff for nodes if it existes in hiera (Feature
 #3875)

---
 puppet/modules/soledad/manifests/server.pp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'puppet/modules/soledad/manifests/server.pp')

diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 393d416a..c0af238c 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -9,6 +9,9 @@ class soledad::server {
   $couchdb_user     = $couchdb['couchdb_admin_user']['username']
   $couchdb_password = $couchdb['couchdb_admin_user']['password']
 
+  include site_config::x509::cert_key
+  include site_config::x509::ca
+
   $x509      = hiera('x509')
   $x509_key  = $x509['key']
   $x509_cert = $x509['cert']
-- 
cgit v1.2.3


From 12d22a47ad529f02e0c6d27b25f7ddaa17a32727 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 19 Sep 2013 12:32:35 +0200
Subject: soledad should use default key, cert and ca (Feature #3841)

---
 puppet/modules/soledad/manifests/server.pp | 31 ++++++++----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

(limited to 'puppet/modules/soledad/manifests/server.pp')

diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index c0af238c..0c073443 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -12,29 +12,9 @@ class soledad::server {
   include site_config::x509::cert_key
   include site_config::x509::ca
 
-  $x509      = hiera('x509')
-  $x509_key  = $x509['key']
-  $x509_cert = $x509['cert']
-  $x509_ca   = $x509['ca_cert']
-
   $soledad      = hiera('soledad')
   $soledad_port = $soledad['port']
 
-  x509::key { 'soledad':
-    content => $x509_key,
-    notify  => Service['soledad-server'];
-  }
-
-  x509::cert { 'soledad':
-    content => $x509_cert,
-    notify  => Service['soledad-server'];
-  }
-
-  x509::ca { 'soledad':
-    content => $x509_ca,
-    notify  => Service['soledad-server'];
-  }
-
   #
   # SOLEDAD CONFIG
   #
@@ -50,8 +30,9 @@ class soledad::server {
 
   package { 'soledad-server':
     ensure  => latest,
-    require => [ Class['site_apt::preferences::twisted'],
-                 Class['site_apt::leap_repo'] ];
+    require => [
+      Class['site_apt::preferences::twisted'],
+      Class['site_apt::leap_repo'] ];
   }
 
   file { '/etc/default/soledad':
@@ -68,7 +49,11 @@ class soledad::server {
     enable     => true,
     hasstatus  => true,
     hasrestart => true,
-    require    => [ Class['soledad'], Package['soledad-server'] ];
+    require    => [
+      Class['soledad'],
+      Package['soledad-server'],
+      Class['Site_config::X509::Cert_key'],
+      Class['Site_config::X509::Ca'] ];
   }
 
   include site_shorewall::soledad
-- 
cgit v1.2.3