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

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 3747c1295..99e769ca0 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,33 +1,6 @@
 class porterbox {
 	include schroot
-	# FIXME: Refactor this to a common class when something else needs it
-	package { 'moreutils':
-		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/fstab':
-		source  => 'puppet:///modules/porterbox/schroot-dsa/fstab',
-	}
-	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'],
-	}
 	file { '/usr/local/bin/dd-schroot-cmd':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
@@ -36,15 +9,11 @@ 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':
+		content  => "0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots\n",
 	}
-	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',
 	}
 }