diff options
| author | Azul <azul@riseup.net> | 2014-06-23 21:50:50 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2014-06-23 21:54:10 +0200 |
| commit | 9cf230751b824d9134e710739520bc8deda14e8e (patch) | |
| tree | de32d5fa2a44bfff9baa97c5ed581c94c8cd3527 /puppet/modules | |
| parent | 0accf1788b9c7fef05e4436c5015d9099451be05 (diff) | |
hand replication credentials to tapicero
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/tapicero/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/tapicero/templates/tapicero.yaml.erb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp index 1db75eb0..fd8c1344 100644 --- a/puppet/modules/tapicero/manifests/init.pp +++ b/puppet/modules/tapicero/manifests/init.pp @@ -12,7 +12,8 @@ class tapicero { $couchdb_soledad_user = $couchdb_users['soledad']['username'] $couchdb_leap_mx_user = $couchdb_users['leap_mx']['username'] - $couchdb_mirror = $couchdb['mode'] == 'mirror' + $couchdb_mode = $couchdb['mode'] + $couchdb_replication = $couchdb['replication'] 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 3a5f821e..182a6aa6 100644 --- a/puppet/modules/tapicero/templates/tapicero.yaml.erb +++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb @@ -24,7 +24,8 @@ log_level: info options: # prefix for per user databases: db_prefix: "user-" - mirror: <%= @couchdb_mirror %> + mode: <%= @couchdb_mode %> + replication: <%= @couchdb_replication %> # security settings to be used for the per user databases security: |