summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-10-20 16:30:27 +0200
committervarac <varacanero@zeromail.org>2016-10-20 16:30:27 +0200
commit09d4a5de6d7a9e05b85db4a410e9572b7e9408e2 (patch)
tree1cb5cd1441cd547b51da754e70adc1a761ad67ee /puppet/modules
parentdc2de6b3a666dc5b3692a32ab8ce16afd23a6ee7 (diff)
parent0b279d8a66293bdf5fe20a77b557055a95a66a46 (diff)
Merge branch 'soledad_ordering' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_couchdb/manifests/add_users.pp3
-rw-r--r--puppet/modules/site_couchdb/manifests/create_dbs.pp3
-rw-r--r--puppet/modules/site_couchdb/manifests/setup.pp11
3 files changed, 10 insertions, 7 deletions
diff --git a/puppet/modules/site_couchdb/manifests/add_users.pp b/puppet/modules/site_couchdb/manifests/add_users.pp
index c905316b..f12c5a5e 100644
--- a/puppet/modules/site_couchdb/manifests/add_users.pp
+++ b/puppet/modules/site_couchdb/manifests/add_users.pp
@@ -33,7 +33,8 @@ class site_couchdb::add_users {
roles => '["tokens"]',
pw => $site_couchdb::couchdb_soledad_pw,
salt => $site_couchdb::couchdb_soledad_salt,
- require => Couchdb::Query::Setup['localhost']
+ require => Couchdb::Query::Setup['localhost'],
+ notify => Service['soledad-server'];
}
## webapp couchdb user
diff --git a/puppet/modules/site_couchdb/manifests/create_dbs.pp b/puppet/modules/site_couchdb/manifests/create_dbs.pp
index a2d1c655..ddfb7d65 100644
--- a/puppet/modules/site_couchdb/manifests/create_dbs.pp
+++ b/puppet/modules/site_couchdb/manifests/create_dbs.pp
@@ -44,7 +44,8 @@ class site_couchdb::create_dbs {
## r/w: soledad
couchdb::create_db { 'shared':
members => "{ \"names\": [\"${site_couchdb::couchdb_soledad_user}\"], \"roles\": [\"replication\"] }",
- require => Couchdb::Query::Setup['localhost']
+ require => Couchdb::Query::Setup['localhost'],
+ notify => Service['soledad-server'];
}
## tickets database
diff --git a/puppet/modules/site_couchdb/manifests/setup.pp b/puppet/modules/site_couchdb/manifests/setup.pp
index 7477d24c..a749c628 100644
--- a/puppet/modules/site_couchdb/manifests/setup.pp
+++ b/puppet/modules/site_couchdb/manifests/setup.pp
@@ -17,11 +17,11 @@ class site_couchdb::setup {
# (i.e. using curl/wget without passing credentials)
file {
'/etc/couchdb/couchdb.netrc':
- ensure => link,
- target => "/etc/couchdb/couchdb-${user}.netrc";
+ ensure => link,
+ target => "/etc/couchdb/couchdb-${user}.netrc";
'/root/.netrc':
- ensure => link,
- target => '/etc/couchdb/couchdb.netrc';
+ ensure => link,
+ target => '/etc/couchdb/couchdb.netrc';
}
# setup /etc/couchdb/couchdb-soledad-admin.netrc file for couchdb admin
@@ -33,7 +33,8 @@ class site_couchdb::setup {
mode => '0400',
owner => 'soledad-admin',
group => 'root',
- require => [ Package['couchdb'], User['soledad-admin'] ];
+ require => [ Package['couchdb'], User['soledad-admin'] ],
+ notify => Service['soledad-server'];
}
}