summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2014-07-14 19:50:41 +0200
committerAzul <azul@riseup.net>2014-07-14 19:50:41 +0200
commit3206634d0d17064ecd4b18cc8e2e47051e422bf3 (patch)
tree233a8ea0c45e8c5050aaff765791b130b89b463f /puppet
parent3e8721d4c4e0ad8ea0daae3c35c79f7130afda6e (diff)
proper json for tapicero config
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/tapicero/templates/tapicero.yaml.erb6
1 files changed, 5 insertions, 1 deletions
diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb
index 182a6aa6..d6ea56fa 100644
--- a/puppet/modules/tapicero/templates/tapicero.yaml.erb
+++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb
@@ -1,3 +1,5 @@
+<%- require 'json' -%>
+
#
# Default configuration options for Tapicero
#
@@ -25,7 +27,9 @@ options:
# prefix for per user databases:
db_prefix: "user-"
mode: <%= @couchdb_mode %>
- replication: <%= @couchdb_replication %>
+<%- if @couchdb_replication %>
+ replication: <%= @couchdb_replication.to_json %>
+<%- end -%>
# security settings to be used for the per user databases
security: