X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=847f5d685e09a4d6cde2b683dea874d08c40b56f;hb=168aa3f05f914802698b8db5fdde823c4e992913;hp=b2a8620ed7ea5f1f9eac51a13207f55ca00a1587;hpb=1055b6b9d0f2f0c30898fc74df2e3b092ebfd543;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index b2a8620ed..847f5d685 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,35 +1,27 @@
-class porterbox ($ensure = present){
-	if $ensure in present {
-		include schroot
+class porterbox {
+	include schroot
+
+	package { 'dgit':
+		ensure => installed,
 	}
 
 	file { '/usr/local/bin/dd-schroot-cmd':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
-		ensure => $ensure,
 	}
 	file { '/usr/local/bin/schroot-list-sessions':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
-		ensure => $ensure,
-	}
-	file { '/usr/local/sbin/setup-dchroot':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/setup-dchroot',
-		ensure => $ensure,
-	}
-	file { '/usr/local/sbin/setup-all-dchroots':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/setup-all-dchroots',
-		ensure => $ensure,
 	}
-	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",
-		ensure => $ensure,
+	file { '/etc/cron.d/puppet-update-dchroots': ensure => absent; }
+	concat::fragment { 'puppet-crontab--porterbox-chroot-update':
+		target => '/etc/cron.d/puppet-crontab',
+		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',
 		source  => 'puppet:///modules/porterbox/mail-big-homedirs',
-		ensure => $ensure,
 	}
 }