summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
m---------puppet/modules/couchdb0
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp10
-rw-r--r--puppet/modules/site_haproxy/manifests/init.pp1
m---------puppet/modules/stdlib0
4 files changed, 5 insertions, 6 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject d84dfddb0dfc2e5207c90380fb1f7fcf7bc7a72
+Subproject 4597cf55613aa25e77ef9943c32918fd59ff65c
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index f4f93828..5d77c994 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -65,22 +65,22 @@ class site_couchdb {
}
couchdb::create_db { 'users':
- readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
+ members => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
require => Couchdb::Query::Setup['localhost']
}
couchdb::create_db { 'tokens':
- readers => "{ \"names\": [], \"roles\": [\"auth\"] }",
+ members => "{ \"names\": [], \"roles\": [\"auth\"] }",
require => Couchdb::Query::Setup['localhost']
}
couchdb::create_db { 'sessions':
- readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
+ members => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
require => Couchdb::Query::Setup['localhost']
}
couchdb::create_db { 'tickets':
- readers => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
+ members => "{ \"names\": [\"$couchdb_webapp_user\"], \"roles\": [] }",
require => Couchdb::Query::Setup['localhost']
}
@@ -88,7 +88,7 @@ class site_couchdb {
# via the auth group for now.
# leap_mx could use that for a start.
couchdb::create_db { 'identities':
- readers => "{ \"names\": [], \"roles\": [\"auth\"] }",
+ members => "{ \"names\": [], \"roles\": [\"auth\"] }",
require => Couchdb::Query::Setup['localhost']
}
diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
index ace88a7b..602e26be 100644
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -2,7 +2,6 @@ class site_haproxy {
class { 'haproxy':
enable => true,
- version => '1.4.23-0.1~leap60+1',
manage_service => true,
global_options => {
'log' => '127.0.0.1 local0',
diff --git a/puppet/modules/stdlib b/puppet/modules/stdlib
-Subproject 73b69e8198f702f086ff6afd94a54dddc793589
+Subproject 71cb0f4c2c3bf95f62c9f189f5cef155b09a968