X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=5f3383aee5a57c9072b2413ca60f9964b8b4539e;hb=5dcca55f481da5b65e989a2d5712325bd32fe736;hp=bda81a5713d7c63d3bbd230f017171b125abd50d;hpb=25731380d3d347795315c8748ef291aa27eea2b6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index bda81a571..5f3383aee 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,5 +1,9 @@
 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,
@@ -8,36 +12,49 @@ 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'),
 	}
 	file { '/etc/schroot/setup.d/99porterbox-extra-apt-options':
-		mode    => 555,
+		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    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-setup.d/99porterbox-extra-sources',
 		require => Package['schroot'],
 	}
 	file { '/usr/local/bin/dd-schroot-cmd':
-		mode    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
 	}
 	file { '/usr/local/bin/schroot-list-sessions':
-		mode    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
 	}
 	file { '/usr/local/sbin/setup-dchroot':
-		mode    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/setup-dchroot',
 	}
 	file { '/usr/local/sbin/setup-all-dchroots':
-		mode    => 555,
+		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.weekly/puppet-mail-big-homedirs':
+		mode    => '0555',
+		source  => 'puppet:///modules/porterbox/mail-big-homedirs',
+	}
 }