X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=b2a8620ed7ea5f1f9eac51a13207f55ca00a1587;hb=1055b6b9d0f2f0c30898fc74df2e3b092ebfd543;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..b2a8620ed 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,43 +1,35 @@
-class porterbox {
-	include schroot
-
-	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    => 555,
-		source  => 'puppet:///modules/porterbox/schroot-setup.d/99porterbox-extra-apt-options',
-		require => Package['schroot'],
-	}
-	file { '/etc/schroot/setup.d/99porterbox-extra-sources':
-		mode    => 555,
-		source  => 'puppet:///modules/porterbox/schroot-setup.d/99porterbox-extra-sources',
-		require => Package['schroot'],
+class porterbox ($ensure = present){
+	if $ensure in present {
+		include schroot
 	}
+
 	file { '/usr/local/bin/dd-schroot-cmd':
-		mode    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
+		ensure => $ensure,
 	}
 	file { '/usr/local/bin/schroot-list-sessions':
-		mode    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
+		ensure => $ensure,
 	}
 	file { '/usr/local/sbin/setup-dchroot':
-		mode    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/setup-dchroot',
+		ensure => $ensure,
 	}
 	file { '/usr/local/sbin/setup-all-dchroots':
-		mode    => 555,
+		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.weekly/puppet-mail-big-homedirs':
+		mode    => '0555',
+		source  => 'puppet:///modules/porterbox/mail-big-homedirs',
+		ensure => $ensure,
 	}
 }