summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/site_stunnel/manifests/clients.pp31
-rw-r--r--puppet/modules/site_stunnel/manifests/setup.pp6
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp8
3 files changed, 16 insertions, 29 deletions
diff --git a/puppet/modules/site_stunnel/manifests/clients.pp b/puppet/modules/site_stunnel/manifests/clients.pp
index 28ed6d3c..9f8aeaff 100644
--- a/puppet/modules/site_stunnel/manifests/clients.pp
+++ b/puppet/modules/site_stunnel/manifests/clients.pp
@@ -10,23 +10,16 @@ define site_stunnel::clients (
$rndfile = '/var/lib/stunnel4/.rnd',
$debuglevel = '4' ) {
- $couchdb_stunnel_client_defaults = {
- 'cafile' => $ca_path,
- 'key' => $key_path,
- 'cert' => $cert_path,
- }
-
-
- stunnel::service { $name:
- accept => "127.0.0.1:${accept_port}",
- connect => "${connect}:6984",
- client => $client,
- cafile => $cafile,
- key => $key,
- cert => $cert,
- verify => $verify,
- pid => "/var/run/stunnel4/${pid}.pid",
- rndfile => $rndfile,
- debuglevel => $debuglevel
- }
+ stunnel::service { $name:
+ accept => "127.0.0.1:${accept_port}",
+ connect => "${connect}:6984",
+ client => $client,
+ cafile => $cafile,
+ key => $key,
+ cert => $cert,
+ verify => $verify,
+ pid => "/var/run/stunnel4/${pid}.pid",
+ rndfile => $rndfile,
+ debuglevel => $debuglevel
}
+}
diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp
index a6384a6e..7ec2378f 100644
--- a/puppet/modules/site_stunnel/manifests/setup.pp
+++ b/puppet/modules/site_stunnel/manifests/setup.pp
@@ -1,13 +1,7 @@
class site_stunnel::setup ($cert_name, $key, $cert, $ca) {
- include x509::variables
include site_stunnel
- $ca_name = 'leap_ca'
- $ca_path = "${x509::variables::local_CAs}/${ca_name}.crt"
- $cert_path = "${x509::variables::certs}/${cert_name}.crt"
- $key_path = "${x509::variables::keys}/${cert_name}.key"
-
x509::key {
$cert_name:
content => $key,
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index e45691c1..48a95c8d 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -34,7 +34,7 @@ class site_webapp::couchdb {
}
class { 'site_stunnel::setup':
- cert_name => 'leap_couchdb',
+ cert_name => $cert_name,
key => $key,
cert => $cert,
ca => $ca
@@ -49,9 +49,9 @@ class site_webapp::couchdb {
$couchdb_stunnel_client_defaults = {
'client' => true,
- 'cafile' => $ca_path,
- 'key' => $key_path,
- 'cert' => $cert_path,
+ 'cafile' => "${x509::variables::local_CAs}/${ca_name}.crt",
+ 'key' => "${x509::variables::keys}/${cert_name}.key",
+ 'cert' => "${x509::variables::certs}/${cert_name}.crt",
'verify' => '2',
'rndfile' => '/var/lib/stunnel4/.rnd',
'debuglevel' => '4'