summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-19 15:29:48 +0100
committerMicah Anderson <micah@riseup.net>2013-04-02 10:21:05 -0400
commitec2727a1cae91c34233c831ae31277690a8ef3dc (patch)
tree9800aa34a841db33f74bfe2bcaedbb26ad594fa0
parent4669a64cb8e63a67825a35513b51b4e1f2a4ec5d (diff)
added bigcouch.conf as incoming stunnel config for bigcouch clustering
-rw-r--r--puppet/modules/site_couchdb/manifests/stunnel.pp28
1 files changed, 10 insertions, 18 deletions
diff --git a/puppet/modules/site_couchdb/manifests/stunnel.pp b/puppet/modules/site_couchdb/manifests/stunnel.pp
index 2133d6da..d16e09b5 100644
--- a/puppet/modules/site_couchdb/manifests/stunnel.pp
+++ b/puppet/modules/site_couchdb/manifests/stunnel.pp
@@ -9,24 +9,14 @@ class site_couchdb::stunnel ($key, $cert, $ca) {
$cert_path = "${x509::variables::certs}/${cert_name}.crt"
$key_path = "${x509::variables::keys}/${cert_name}.key"
- x509::key {
- $cert_name:
- content => $key,
- notify => Service['stunnel'];
- }
-
- x509::cert {
- $cert_name:
- content => $cert,
- notify => Service['stunnel'];
- }
-
- x509::ca {
- $ca_name:
- content => $ca,
- notify => Service['stunnel'];
+ class { 'site_stunnel::setup':
+ cert_name => $cert_name,
+ key => $key,
+ cert => $cert,
+ ca => $ca
}
+ # webapp access
stunnel::service { 'couchdb':
accept => '6984',
connect => '127.0.0.1:5984',
@@ -39,9 +29,11 @@ class site_couchdb::stunnel ($key, $cert, $ca) {
rndfile => '/var/lib/stunnel4/.rnd',
debuglevel => '4'
}
+
+ # clustering between bigcouch nodes
stunnel::service { 'bigcouch':
- accept => '6984',
- connect => '127.0.0.1:5984',
+ accept => '5369',
+ connect => '127.0.0.1:4369',
client => false,
cafile => $ca_path,
key => $key_path,