summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2010-02-10 10:41:04 +0100
committervarac <varacanero@zeromail.org>2010-02-10 10:41:04 +0100
commit3decda724d069d976ac92e80b79bbd4ccd5a29de (patch)
treea0274f257fa5f2f2296ba3c43a0a61aaa1a4e959 /manifests/puppetmaster
parenta15d322a91e6c438f65a23b4fe5fb8d63c32def0 (diff)
with puppet::puppetmaster::passenger, service puppetmaster restarts apache2
Diffstat (limited to 'manifests/puppetmaster')
-rw-r--r--manifests/puppetmaster/linux.pp10
1 files changed, 9 insertions, 1 deletions
diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
index 43cd841..abb7bb8 100644
--- a/manifests/puppetmaster/linux.pp
+++ b/manifests/puppetmaster/linux.pp
@@ -1,10 +1,18 @@
# manifests/puppetmaster/linux.pp
class puppet::puppetmaster::linux inherits puppet::linux {
+
+if defined (puppet::puppetmaster::passenger) {
+ $puppetmaster_servicename = "puppetmaster" }
+ else {
+ $puppetmaster_servicename = "apache2"
+ }
+
service{'puppetmaster':
ensure => running,
- enable => true,
+ name => $puppetmaster_servicename,
+ enable => true,
require => [ Package[puppet] ],
}