summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-06 10:36:18 +0100
committervarac <varacanero@zeromail.org>2012-11-06 10:36:18 +0100
commit561ea1c6dace320455990b880d8a7da421fcb8bc (patch)
treeabcb1f11db688d2b69143514770885283136f4c1 /puppet
parent0fdf251c78891cee9a95f93954a43876d0399be6 (diff)
sleep some more after couchdb restart, adopt new hiera creditials
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_couchdb/manifests/configure.pp5
1 files changed, 2 insertions, 3 deletions
diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp
index 4343cc2b..25ea7a0b 100644
--- a/puppet/modules/site_couchdb/manifests/configure.pp
+++ b/puppet/modules/site_couchdb/manifests/configure.pp
@@ -12,10 +12,9 @@ class site_couchdb::configure {
group => 'root',
}
- $adminpw = $site_couchdb::adminpw
file { '/etc/couchdb/local.d/admin.ini':
content => "[admins]
-admin = $adminpw
+admin = $site_couchdb::couchdb_admin_pw
",
mode => '0600',
owner => 'couchdb',
@@ -24,7 +23,7 @@ admin = $adminpw
}
- exec { '/etc/init.d/couchdb restart; sleep 3':
+ exec { '/etc/init.d/couchdb restart; sleep 6':
path => ['/bin', '/usr/bin',],
subscribe => File['/etc/couchdb/local.d/admin.ini',
'/etc/couchdb/local.ini'],