summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-04-10 21:13:59 +0000
committermh <mh@immerda.ch>2008-04-10 21:13:59 +0000
commitda3b546ff3c617ae36249f0d1395bd27f9820bc6 (patch)
tree49de337f0db7294c3360843dd091c2d779e7cb93 /manifests/init.pp
parent2858e8d4eb9de90e0ab5d03bcd468d00fa8b8b56 (diff)
fixed some issues, added dependecies
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp9
1 files changed, 9 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b118e99..c58adbb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -77,6 +77,11 @@ class puppetmaster inherits puppet {
require => Package[puppet],
}
+
+ Service[puppet]{
+ require +> Service[puppetmaster],
+ }
+
$real_puppetmaster_conf_source = $puppet_conf_source ? {
'' => [ "puppet://$server/files/puppet/master/puppet.conf",
"puppet://$server/puppet/master/puppet.conf" ],
@@ -106,6 +111,10 @@ class puppetmaster inherits puppet {
class puppetmaster::cluster inherits puppetmaster {
include mongrel, nginx
+ Service[puppetmaster]{
+ require +> Service[ngnix],
+ }
+
File[puppet_config] {
require => [ Package[mongrel], Package[nginx], File[nginx_config] ],
}