diff --git a/modules/planet/manifests/site.pp b/modules/planet/manifests/site.pp index 98da016a84..5f76c0c785 100644 --- a/modules/planet/manifests/site.pp +++ b/modules/planet/manifests/site.pp @@ -14,15 +14,6 @@ define planet::site($git_url) { require => Package[nginx], } -# if we already have the mercurial repo the pull updates - - exec { "update_${name}_planet": - command => "git pull --ff-only", - cwd => "/var/lib/planet/${name}", - path => "/bin:/usr/bin", - onlyif => "test -d /var/lib/planet/${name}" - } - # otherwise get a new clone of it exec { "create_${name}_planet": @@ -34,7 +25,7 @@ define planet::site($git_url) { cron { "update_planet_${name}": user => root, minute => "*/5", - command => "date >> /var/log/planet/${name}.log && cd /var/lib/planet/${name} && planet /var/lib/planet/${name}/planet.ini >> /var/log/planet/${name}.log 2>&1" + command => "date >> /var/log/planet/${name}.log && cd /var/lib/planet/${name} && git pull -q --ff-only && planet /var/lib/planet/${name}/planet.ini >> /var/log/planet/${name}.log 2>&1" } }