summaryrefslogtreecommitdiff
path: root/manifests/puppetmaster/linux.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-08-22 14:22:52 -0400
committerMicah Anderson <micah@riseup.net>2012-08-22 14:22:52 -0400
commit6af581ed82a908c6b1fdc8e17bda30a85c8b9d71 (patch)
tree27bfa1daf28400f5cd6e87401a5e85156a733e73 /manifests/puppetmaster/linux.pp
parent1d3e2b5bd6788894c49d8db6ab65f67b0540b87d (diff)
parentdcf1036eb3b8f8d90eef208dd7766b1602b2b2e3 (diff)
Merge branch 'leap' into tmp
Diffstat (limited to 'manifests/puppetmaster/linux.pp')
-rw-r--r--manifests/puppetmaster/linux.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
index 5cde0c3..7c2e428 100644
--- a/manifests/puppetmaster/linux.pp
+++ b/manifests/puppetmaster/linux.pp
@@ -6,8 +6,10 @@ class puppet::puppetmaster::linux inherits puppet::linux {
exec { 'notify_passenger_puppetmaster':
refreshonly => true,
- command => 'touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && rm /etc/puppet/rack/tmp/restart.txt',
+ #command => 'touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && rm /etc/puppet/rack/tmp/restart.txt',
+ command => '/etc/init.d/apache2 reload',
}
+
} else {
service { 'puppetmaster':
ensure => running,