diff options
| author | elijah <elijah@riseup.net> | 2014-06-19 14:30:53 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-19 14:30:53 -0700 |
| commit | 878d23127dd089e7ffc8a1cd30aeaac0d5a9391b (patch) | |
| tree | 9fc5ef8c6ea0e78332f7be6804cf2c8ec5b992c8 /puppet/modules/tapicero | |
| parent | a7380ee34769e8142f4fb9e58825af5fd1342108 (diff) | |
| parent | 01e2469631a7136108149e42b5fc242d8dc90b4c (diff) | |
Merge branch 'feature/couch' of github.com:elijh/leap_platform into feature/couch
Diffstat (limited to 'puppet/modules/tapicero')
| -rw-r--r-- | puppet/modules/tapicero/manifests/init.pp | 1 | ||||
| -rw-r--r-- | puppet/modules/tapicero/templates/tapicero.yaml.erb | 2 |
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: [] + |