X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fweblog_provider.pp;h=0b3cb8d8ad487422f6be562898e16bcdd1368d92;hb=215eb0d5ea9554968240656b34135008f83a185b;hp=df506020968e97ad4702d730e2753574a0880734;hpb=00597b43442ab52e5a293837bf73274fb40e6655;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp index df5060209..0b3cb8d8a 100644 --- a/modules/roles/manifests/weblog_provider.pp +++ b/modules/roles/manifests/weblog_provider.pp @@ -5,8 +5,12 @@ class roles::weblog_provider { onlyif => '/usr/bin/getent passwd weblogsync > /dev/null && ! [ -e /home/weblogsync/.ssh/id_rsa ]' } } else { - file { '/etc/cron.d/puppet-weblog-provider': - content => "SHELL=/bin/bash\n\n0 1 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include 'www.debian.org-access.log-*gz' --include '*-public-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@wolkenstein.debian.org:-weblogs-incoming-\n", + file { '/etc/cron.d/puppet-weblog-provider': ensure => absent, } + concat::fragment { 'dsa-puppet-stuff--weblog-provider': + target => '/etc/cron.d/dsa-puppet-stuff', + content => @(EOF) + 0 1 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include 'www.debian.org-access.log-*gz' --include '*-public-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@wolkenstein.debian.org:-weblogs-incoming- + | EOF } } }