summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/puppetmaster/linux.pp31
1 files changed, 19 insertions, 12 deletions
diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
index abb7bb8..2a71dd4 100644
--- a/manifests/puppetmaster/linux.pp
+++ b/manifests/puppetmaster/linux.pp
@@ -2,20 +2,27 @@
class puppet::puppetmaster::linux inherits puppet::linux {
-if defined (puppet::puppetmaster::passenger) {
- $puppetmaster_servicename = "puppetmaster" }
+ if defined (puppet::puppetmaster::passenger) {
+ service{'puppetmaster':
+ ensure => running,
+ #name => apache2,
+ #enable => true,
+ pattern => 'apache2',
+ hasstatus => true,
+ start => '/etc/init.d/apache2 start',
+ stop => '/etc/init.d/apache2 start',
+ restart => '/etc/init.d/apache2 restart',
+ status => 'pgrep apache2',
+ require => [ Package[puppet] ],
+ }
+ }
else {
- $puppetmaster_servicename = "apache2"
- }
-
-
- service{'puppetmaster':
- ensure => running,
- name => $puppetmaster_servicename,
- enable => true,
- require => [ Package[puppet] ],
+ service{'puppetmaster':
+ ensure => running,
+ enable => true,
+ require => [ Package[puppet] ],
+ }
}
-
Service[puppet]{
require +> Service[puppetmaster],
}