X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fweblog_provider.pp;h=0b3cb8d8ad487422f6be562898e16bcdd1368d92;hb=6632ba2a54e021d9e09089197f392d5e6e279d02;hp=30c4d5f1f9f1d597904af48c0ad05fd1db4d3e17;hpb=c4ebe9feb777e39bfb9bd6788fe4e134b1c4536b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp
index 30c4d5f1f..0b3cb8d8a 100644
--- a/modules/roles/manifests/weblog_provider.pp
+++ b/modules/roles/manifests/weblog_provider.pp
@@ -5,12 +5,12 @@ class roles::weblog_provider {
 			onlyif  => '/usr/bin/getent passwd weblogsync > /dev/null && ! [ -e /home/weblogsync/.ssh/id_rsa ]'
 		}
 	} else {
-		file { '/var/log/apache2':
-			ensure => directory,
-			mode   => '0755',
-		}
-		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
 		}
 	}
 }