X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=4ed9a21f4a0d0e3df5a04642ec8804f7b224b3a5;hb=44688b3127634f8a9369c6419f45a706a39ee628;hp=801798578d09382b265f7a32c8d629ba3c1096e0;hpb=f9edc08d80cae5ea635ba30159133155ecdc23d7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 801798578..4ed9a21f4 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -9,16 +9,12 @@ class porterbox {
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
 	}
-	file { '/usr/local/sbin/setup-dchroot':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/setup-dchroot',
-	}
-	file { '/usr/local/sbin/setup-all-dchroots':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/setup-all-dchroots',
-	}
-	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 chronic 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',