summaryrefslogtreecommitdiff
path: root/puppet/modules/tapicero
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
committervarac <varacanero@zeromail.org>2014-09-03 23:08:08 +0200
commit0df84cf7987c3047ecc0353e8d29c2c38437a5a2 (patch)
treec0db8548571cba8ef8bb5c2a258136c97780acf7 /puppet/modules/tapicero
parenta54b82ff7cdae2e44bc3c159473ca03e283f0746 (diff)
parentb806d84a2fc292e3fb8a3f5fd1fb029c2cdb629e (diff)
Merge branch 'master' into develop
Conflicts: platform.rb puppet/modules/site_config/manifests/hosts.pp
Diffstat (limited to 'puppet/modules/tapicero')
-rw-r--r--puppet/modules/tapicero/manifests/init.pp6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/tapicero/manifests/init.pp b/puppet/modules/tapicero/manifests/init.pp
index fd8c1344..2bf72004 100644
--- a/puppet/modules/tapicero/manifests/init.pp
+++ b/puppet/modules/tapicero/manifests/init.pp
@@ -124,9 +124,11 @@ class tapicero {
service { 'tapicero':
ensure => running,
enable => true,
- hasstatus => true,
+ hasstatus => false,
hasrestart => true,
- require => [ File['/etc/init.d/tapicero'], File['/var/run/tapicero'] ];
+ require => [ File['/etc/init.d/tapicero'],
+ File['/var/run/tapicero'],
+ Couchdb::Add_user[$::site_couchdb::couchdb_tapicero_user] ];
}
}