X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=5f3383aee5a57c9072b2413ca60f9964b8b4539e;hb=e17f70ac0bb3bf9d91af806d2aa1acecbaadfbbd;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..5f3383aee 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,7 +1,7 @@
 class porterbox {
 	include schroot
 	# FIXME: Refactor this to a common class when something else needs it
-	package { 'chronic':
+	package { 'moreutils':
 		ensure => installed
 	}
 
@@ -12,6 +12,15 @@ class porterbox {
 	file { '/etc/schroot/dsa/config':
 		source  => 'puppet:///modules/porterbox/schroot-dsa/config',
 	}
+	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		file { '/etc/schroot/dsa/fstab':
+			source  => 'puppet:///modules/porterbox/schroot-dsa/fstab',
+		}
+	} else {
+		file { '/etc/schroot/dsa/fstab':
+			source  => 'puppet:///modules/porterbox/schroot-dsa/fstab-freebsd',
+		}
+	}
 	file { '/etc/schroot/dsa/default-mirror':
 		content => template('porterbox/default-mirror.erb'),
 	}
@@ -44,4 +53,8 @@ class porterbox {
 	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.weekly/puppet-mail-big-homedirs':
+		mode    => '0555',
+		source  => 'puppet:///modules/porterbox/mail-big-homedirs',
+	}
 }