summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp26
1 files changed, 13 insertions, 13 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 88fb214..82d4c25 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -76,19 +76,6 @@ class puppetmaster inherits puppet {
case $operatingsystem {
linux: { include puppetmaster::linux }
}
-}
-
-class puppetmaster::linux inherits puppet::linux {
- service{'puppetmaster':
- ensure => running,
- require => Package[puppet],
- }
-
-
- Service[puppet]{
- require +> Service[puppetmaster],
- }
-
File[puppet_config]{
source => [ "puppet://$server/files/puppet/master/puppet.conf",
"puppet://$server/puppet/master/puppet.conf" ],
@@ -110,6 +97,19 @@ class puppetmaster::linux inherits puppet::linux {
}
}
+class puppetmaster::linux inherits puppet::linux {
+ service{'puppetmaster':
+ ensure => running,
+ require => Package[puppet],
+ }
+
+
+ Service[puppet]{
+ require +> Service[puppetmaster],
+ }
+
+}
+
class puppetmaster::cluster inherits puppetmaster {
include mongrel, nginx