summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-07-06 16:20:50 +0000
committervarac <varacanero@zeromail.org>2012-07-06 16:20:50 +0000
commit931f021a1fe45636aec3b5332848dd912425affe (patch)
treeef2f3f2ebc83413278a3b5cdd62610d9c1644ac2
parentdffec4d8134be8a2eb2bb3a8063b2d60d67308f1 (diff)
notify_passenger_puppetmaster: do apache2 reload
instead of touching .../restart.txt, which doen't seem to work with libapache2-mod-passenger 2.2.11debian-2
-rw-r--r--manifests/puppetmaster/linux.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp
index 2670203..31f8853 100644
--- a/manifests/puppetmaster/linux.pp
+++ b/manifests/puppetmaster/linux.pp
@@ -3,7 +3,8 @@ class puppet::puppetmaster::linux inherits puppet::linux {
if $puppetmaster_mode == 'passenger' {
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':