X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=ba83efd4e529b6889e1eff9db46167e7404adb31;hb=cb99d997e736f428f4f1264a0894e30b5302ef3d;hp=99e769ca03f01ab02c362840183b20d46f915890;hpb=c5e660a55fca2dea5359be4884693ccf2d0746cc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 99e769ca0..ba83efd4e 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,6 +1,10 @@
 class porterbox {
 	include schroot
 
+	package { 'dgit':
+		ensure => installed,
+	}
+
 	file { '/usr/local/bin/dd-schroot-cmd':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
@@ -9,8 +13,12 @@ class porterbox {
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
 	}
-	file { '/etc/cron.d/puppet-update-dchroots':
-		content  => "0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots\n",
+	file { '/etc/cron.d/puppet-update-dchroots': ensure => absent; }
+	concat::fragment { 'dsa-puppet-stuff--porterbox-chroot-update':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		content  => @(EOF)
+			0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots
+			| EOF
 	}
 	file { '/etc/cron.weekly/puppet-mail-big-homedirs':
 		mode    => '0555',