summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-03-31 12:19:46 -0400
committerMicah Anderson <micah@riseup.net>2013-04-02 10:21:06 -0400
commit6714ff4ae1a53b6b3eda66f13c2212c3ba285bf3 (patch)
tree550bb368525b96dc2cb3e8f98bb871ed25b1f031 /puppet
parentfa65ec5b35433ecc643aa240db4c42e60dac6af9 (diff)
refactor couch_client stunnel to use new stunnel_client leap_cli macro
re-order variables to be more consistant
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb.pp32
1 files changed, 20 insertions, 12 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp
index ffc4454b..e956fd54 100644
--- a/puppet/modules/site_webapp/manifests/couchdb.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb.pp
@@ -1,9 +1,5 @@
class site_webapp::couchdb {
- $x509 = hiera('x509')
- $key = $x509['key']
- $cert = $x509['cert']
- $ca = $x509['ca_cert']
$webapp = hiera('webapp')
# haproxy listener on port localhost:4096, see site_webapp::haproxy
$couchdb_host = 'localhost'
@@ -13,6 +9,21 @@ class site_webapp::couchdb {
$couchdb_webapp_user = $webapp['couchdb_webapp_user']['username']
$couchdb_webapp_password = $webapp['couchdb_webapp_user']['password']
+ $stunnel = hiera('stunnel')
+ $couch_client = $stunnel['couch_client']
+ $couch_client_connect = $couch_client['connect']
+
+ include x509::variable
+ $x509 = hiera('x509')
+ $key = $x509['key']
+ $cert = $x509['cert']
+ $ca = $x509['ca_cert']
+ $cert_name = 'leap_couchdb'
+ $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"
+
file {
'/srv/leap-webapp/config/couchdb.yml.admin':
content => template('site_webapp/couchdb.yml.admin.erb'),
@@ -48,15 +59,12 @@ class site_webapp::couchdb {
}
$couchdb_stunnel_client_defaults = {
- 'connect_port' => '6984',
+ 'connect_port' => $couch_client_connect,
'client' => true,
- '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'
+ 'cafile' => $ca_path,
+ 'key' => $key_path,
+ 'cert' => $cert_path,
}
- create_resources(site_stunnel::clients, hiera('stunnel'), $couchdb_stunnel_client_defaults)
+ create_resources(site_stunnel::clients, $couch_client, $couchdb_stunnel_client_defaults)
}