X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=847f5d685e09a4d6cde2b683dea874d08c40b56f;hb=faf0b00a7b3ef90757b7fcf9dec93c9987383f8a;hp=7b08b8b4b9a301a82534c46b7dbdb945ced0d1ec;hpb=95e68eccbf9e18913d23a92c2cc57b8da6eb6982;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 7b08b8b4b..847f5d685 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,32 +1,27 @@
 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'],
+	package { 'dgit':
+		ensure => installed,
 	}
+
 	file { '/usr/local/bin/dd-schroot-cmd':
-		mode    => 555,
+		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
 	}
-	file { '/usr/local/sbin/setup-dchroot':
-		mode    => 555,
-		source  => 'puppet:///modules/porterbox/setup-dchroot',
+	file { '/usr/local/bin/schroot-list-sessions':
+		mode    => '0555',
+		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
+	}
+	file { '/etc/cron.d/puppet-update-dchroots': ensure => absent; }
+	concat::fragment { 'puppet-crontab--porterbox-chroot-update':
+		target => '/etc/cron.d/puppet-crontab',
+		content  => @(EOF)
+			0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots
+			| EOF
+	}
+	file { '/etc/cron.weekly/puppet-mail-big-homedirs':
+		mode    => '0555',
+		source  => 'puppet:///modules/porterbox/mail-big-homedirs',
 	}
 }