summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2014-06-19 20:01:20 +0200
committerAzul <azul@riseup.net>2014-06-19 20:01:20 +0200
commitae3ad84bdf646ddb3c8da9258201307ede65ea41 (patch)
tree86c8d67d2cb7213d877a70e4093827fc5788adcf
parentb286f81dd29404b64494dab3fe1e7a2bec1c9c46 (diff)
set mirror option if we are on a couch mirror
-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: []
+