From 9e54a92395046dde9a588e3d8e80ded99745ade2 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 20 Jan 2010 14:08:29 +0100 Subject: changed destination from /opt/bin/puppetlast to /usr/local/bin --- manifests/puppetmaster/checklastrun.pp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'manifests/puppetmaster') diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp index 7eae8a3..fdcc096 100644 --- a/manifests/puppetmaster/checklastrun.pp +++ b/manifests/puppetmaster/checklastrun.pp @@ -1,20 +1,12 @@ class puppet::puppetmaster::checklastrun { - case $operatingsystem { - debian,ubuntu: { $puppetlast_dest = "/usr/local/bin/puppetlast" } - default: { $puppetlast_dest = "/opt/bin/puppetlast" } - } - - - - - file{"$puppetlast_dest": + file{"/usr/local/bin/puppetlast": source => [ "puppet://$server/modules/site-puppet/master/puppetlast", "puppet://$server/modules/puppet/master/puppetlast"], owner => root, group => 0, mode => 0700; } file{'/etc/cron.d/puppetlast.cron': - content => "40 10,22 * * * root $puppetlast_dest\n", - require => File["$puppetlast_dest"], + content => "40 10,22 * * * root /usr/local/bin/puppetlast\n", + require => File["/usr/local/bin/puppetlast"], owner => root, group => 0, mode => 0644, notify => service["crond"]; } -- cgit v1.2.3