From fcbf7c0b4df14149269b646b5ac8e66acd63647e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 6 Sep 2013 17:37:03 +0200
Subject: use define instead of class for site_stunnel::setup (#3817)

so it can be called multiple times
---
 puppet/modules/site_stunnel/manifests/setup.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_stunnel/manifests/setup.pp')

diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp
index 92eeb425..7fd18d47 100644
--- a/puppet/modules/site_stunnel/manifests/setup.pp
+++ b/puppet/modules/site_stunnel/manifests/setup.pp
@@ -1,4 +1,4 @@
-class site_stunnel::setup ($cert_name, $key, $cert, $ca_name, $ca) {
+define site_stunnel::setup ($cert_name, $key, $cert, $ca_name, $ca) {
 
   include site_stunnel
 
-- 
cgit v1.2.3


From a6c19295e276da865f6c66963ed761d3ebc7dc99 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 13 Sep 2013 14:17:54 +0200
Subject: remove x509::ca for leap_ca in site_openvpn::keys and
 site_stunnel::stunnel (#3817)

---
 puppet/modules/site_stunnel/manifests/setup.pp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'puppet/modules/site_stunnel/manifests/setup.pp')

diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp
index 7fd18d47..2309800b 100644
--- a/puppet/modules/site_stunnel/manifests/setup.pp
+++ b/puppet/modules/site_stunnel/manifests/setup.pp
@@ -14,11 +14,5 @@ define site_stunnel::setup ($cert_name, $key, $cert, $ca_name, $ca) {
       notify  => Service['stunnel'];
   }
 
-  x509::ca {
-    $ca_name:
-      content => $ca,
-      notify  => Service['stunnel'];
-  }
-
 }
 
-- 
cgit v1.2.3


From 3e5e685200e9b5c3ac8567100e552929ea55d8e8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 13 Sep 2013 16:20:07 +0200
Subject: setup stunnel config to use default x509 cert,key+ca (#3837)

* fix stunnel setups for couchdb, mx, webapp services
---
 puppet/modules/site_stunnel/manifests/setup.pp | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 puppet/modules/site_stunnel/manifests/setup.pp

(limited to 'puppet/modules/site_stunnel/manifests/setup.pp')

diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp
deleted file mode 100644
index 2309800b..00000000
--- a/puppet/modules/site_stunnel/manifests/setup.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-define site_stunnel::setup ($cert_name, $key, $cert, $ca_name, $ca) {
-
-  include site_stunnel
-
-  x509::key {
-    $cert_name:
-      content => $key,
-      notify  => Service['stunnel'];
-  }
-
-  x509::cert {
-    $cert_name:
-      content => $cert,
-      notify  => Service['stunnel'];
-  }
-
-}
-
-- 
cgit v1.2.3