summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster/linux.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/puppetmaster/linux.pp')
-rw-r--r--manifests/puppetmaster/linux.pp35
1 files changed, 16 insertions, 19 deletions
diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
index 2a71dd4..062d907 100644
--- a/manifests/puppetmaster/linux.pp
+++ b/manifests/puppetmaster/linux.pp
@@ -1,29 +1,26 @@
-# manifests/puppetmaster/linux.pp
-
class puppet::puppetmaster::linux inherits puppet::linux {
-
- if defined (puppet::puppetmaster::passenger) {
- service{'puppetmaster':
+
+ if defined (puppet::puppetmaster::passenger) {
+ service{'puppetmaster':
ensure => running,
- #name => apache2,
+ #name => apache2,
#enable => true,
- pattern => 'apache2',
+ pattern => 'apache2',
hasstatus => true,
- start => '/etc/init.d/apache2 start',
+ start => '/etc/init.d/apache2 start',
stop => '/etc/init.d/apache2 start',
restart => '/etc/init.d/apache2 restart',
- status => 'pgrep apache2',
+ status => 'pgrep apache2',
require => [ Package[puppet] ],
- }
- }
- else {
- service{'puppetmaster':
+ }
+ } else {
+ service{'puppetmaster':
ensure => running,
- enable => true,
+ enable => true,
require => [ Package[puppet] ],
- }
- }
- Service[puppet]{
- require +> Service[puppetmaster],
- }
+ }
+ }
+ Service[puppet]{
+ require +> Service[puppetmaster],
+ }
}