summaryrefslogtreecommitdiff
path: root/puppet/modules/tapicero
diff options
context:
space:
mode:
authorElijah Sparrow <elijah@riseup.net>2014-06-19 14:28:59 -0700
committerElijah Sparrow <elijah@riseup.net>2014-06-19 14:28:59 -0700
commit01e2469631a7136108149e42b5fc242d8dc90b4c (patch)
tree4f7cbb3e5fcc91c8ab2cf3ca6ff53ce03b37c384 /puppet/modules/tapicero
parent1b5f0892bbcb07fa075bfe8c7b083521b38cb73c (diff)
parent9034a2eb1fdec68d46aa0d1ea2720409a7312f35 (diff)
Merge pull request #2 from azul/feature/couch
split out bigcouch and only apply if needed, initial code for replication
Diffstat (limited to 'puppet/modules/tapicero')
-rw-r--r--puppet/modules/tapicero/manifests/init.pp1
-rw-r--r--puppet/modules/tapicero/templates/tapicero.yaml.erb2
2 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp
index af1a96ac..1db75eb0 100644
--- a/puppet/modules/tapicero/manifests/init.pp
+++ b/puppet/modules/tapicero/manifests/init.pp
@@ -12,6 +12,7 @@ class tapicero {
$couchdb_soledad_user = $couchdb_users['soledad']['username']
$couchdb_leap_mx_user = $couchdb_users['leap_mx']['username']
+ $couchdb_mirror = $couchdb['mode'] == 'mirror'
Class['site_config::default'] -> Class['tapicero']
diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb
index 8e19b22f..3a5f821e 100644
--- a/puppet/modules/tapicero/templates/tapicero.yaml.erb
+++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb
@@ -24,6 +24,7 @@ log_level: info
options:
# prefix for per user databases:
db_prefix: "user-"
+ mirror: <%= @couchdb_mirror %>
# security settings to be used for the per user databases
security:
@@ -40,3 +41,4 @@ options:
- <%= @couchdb_leap_mx_user %>
roles: []
+