diff options
| author | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
| commit | 24e4503906c5ffef236814b003d1fd629989fc40 (patch) | |
| tree | 1721fb6c2387d6cab5c6e6aaa9ab937b52c559f3 /manifests/puppetmaster/linux.pp | |
| parent | 04d8317eb5b70aba62c2b18f6b1bd1d03aedeb5b (diff) | |
| parent | ed7d89163385a6eab4423aae7ce8b5d994339a2f (diff) | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/puppetmaster/debian.pp
manifests/puppetmaster/linux.pp
manifests/puppetmaster/package/debian.pp
Diffstat (limited to 'manifests/puppetmaster/linux.pp')
| -rw-r--r-- | manifests/puppetmaster/linux.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/puppetmaster/linux.pp b/manifests/puppetmaster/linux.pp index 7c2e428..39ca544 100644 --- a/manifests/puppetmaster/linux.pp +++ b/manifests/puppetmaster/linux.pp @@ -6,7 +6,7 @@ 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 => '/usr/bin/touch /etc/puppet/rack/tmp/restart.txt && sleep 1 && /bin/rm /etc/puppet/rack/tmp/restart.txt', command => '/etc/init.d/apache2 reload', } |