Fixed some depencies with Ubuntu from puppet server bootstrap scripts.
This commit is contained in:
parent
11de076716
commit
90312c8d28
1 changed files with 3 additions and 2 deletions
|
@ -184,13 +184,14 @@ class puppet::server::mongrel inherits puppet::client {
|
||||||
ubuntu => Exec["stop-puppetmaster"],
|
ubuntu => Exec["stop-puppetmaster"],
|
||||||
default => undef,
|
default => undef,
|
||||||
},
|
},
|
||||||
|
before => File["/etc/puppet/puppet.conf"],
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { "stop-puppetmaster":
|
exec { "stop-puppetmaster":
|
||||||
command => "service puppetmaster stop ; true",
|
command => "pkill -u puppet ; true",
|
||||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
before => File["/etc/puppet/puppet.conf"],
|
before => File["/etc/default/puppetmaster"],
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::mongrel
|
include ::mongrel
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue