summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/tapicero/templates/tapicero.yaml.erb48
1 files changed, 25 insertions, 23 deletions
diff --git a/puppet/modules/tapicero/templates/tapicero.yaml.erb b/puppet/modules/tapicero/templates/tapicero.yaml.erb
index 098f95bd..cfc02c5c 100644
--- a/puppet/modules/tapicero/templates/tapicero.yaml.erb
+++ b/puppet/modules/tapicero/templates/tapicero.yaml.erb
@@ -2,34 +2,15 @@
# Default configuration options for Tapicero
#
-# database to observe for changes:
-users_db_name: "users"
-
-# prefix for per user databases:
-db_prefix: "user-"
-
# couch connection configuration
-couch_connection:
+connection:
protocol: "http"
host: "localhost"
port: <%= @couchdb_port %>
username: <%= @couchdb_admin_user %>
password: <%= @couchdb_admin_password %>
-
-# security settings to be used for the per user databases
-security:
- admins:
- names:
- # We explicitly allow the admin user to access per user databases, even
- # though admin access ignores per database security we just do this to be
- # explicit about this
- - <%= @couchdb_admin_user %>
- roles: []
- readers:
- names:
- - <%= @couchdb_soledad_user %>
- - <%= @couchdb_leap_mx_user %>
- roles: []
+ prefix : ""
+ suffix : ""
# file to store the last processed user record in so we can resume after
# a restart:
@@ -37,4 +18,25 @@ seq_file: "/var/lib/leap/tapicero/tapicero.seq"
# Configure log_file like this if you want to log to a file instead of syslog:
# log_file: "/var/leap/log/tapicero.log"
-log_level: info
+log_level: debug
+
+# tapicero specific options
+options:
+ # prefix for per user databases:
+ db_prefix: "user-"
+
+ # security settings to be used for the per user databases
+ security:
+ admins:
+ names:
+ # We explicitly allow the admin user to access per user databases, even
+ # though admin access ignores per database security we just do this to be
+ # explicit about this
+ - <%= @couchdb_admin_user %>
+ roles: []
+ readers:
+ names:
+ - <%= @couchdb_soledad_user %>
+ - <%= @couchdb_leap_mx_user %>
+ roles: []
+