summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules')
m---------puppet/modules/couchdb0
-rw-r--r--puppet/modules/site_haproxy/templates/couch.erb4
-rw-r--r--puppet/modules/tapicero/templates/tapicero.yaml.erb6
3 files changed, 7 insertions, 3 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject 8bc5ed434c124457b7467140152602c67a9547c
+Subproject f01b3586215bdc10f0067fa0f6d940be8e88bce
diff --git a/puppet/modules/site_haproxy/templates/couch.erb b/puppet/modules/site_haproxy/templates/couch.erb
index baa31486..f42e8368 100644
--- a/puppet/modules/site_haproxy/templates/couch.erb
+++ b/puppet/modules/site_haproxy/templates/couch.erb
@@ -4,8 +4,8 @@ frontend couch
option httplog
option dontlognull
option http-server-close # use client keep-alive, but close server connection.
- use_backend couch_write if METH_POST
- default_backend couch_read
+ use_backend couch_read if METH_GET
+ default_backend couch_write
backend couch_write
mode http
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: