X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=ba83efd4e529b6889e1eff9db46167e7404adb31;hb=600b3651dfb7fe1c4016debdfbd7d035a39b79c1;hp=6abe6edeb3b5533eea062a9cd4e9e99bfb8c716a;hpb=679f771533f24e2a957bdf3d46151697804acd56;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 6abe6edeb..ba83efd4e 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,30 +1,10 @@
 class porterbox {
 	include schroot
-	# FIXME: Refactor this to a common class when something else needs it
-	package { 'chronic':
-		ensure => installed
-	}
 
-	file { '/etc/schroot/dsa':
-		ensure => directory,
-		require => Package['schroot'],
-	}
-	file { '/etc/schroot/dsa/config':
-		source  => 'puppet:///modules/porterbox/schroot-dsa/config',
-	}
-	file { '/etc/schroot/dsa/default-mirror':
-		content => template('porterbox/default-mirror.erb'),
-	}
-	file { '/etc/schroot/setup.d/99porterbox-extra-apt-options':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/schroot-setup.d/99porterbox-extra-apt-options',
-		require => Package['schroot'],
-	}
-	file { '/etc/schroot/setup.d/99porterbox-extra-sources':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/schroot-setup.d/99porterbox-extra-sources',
-		require => Package['schroot'],
+	package { 'dgit':
+		ensure => installed,
 	}
+
 	file { '/usr/local/bin/dd-schroot-cmd':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
@@ -33,15 +13,15 @@ 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 { '/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 { '/usr/local/sbin/setup-all-dchroots':
+	file { '/etc/cron.weekly/puppet-mail-big-homedirs':
 		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",
+		source  => 'puppet:///modules/porterbox/mail-big-homedirs',
 	}
 }