X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Fmanifests%2Finit.pp;h=14bb914552a96e150431fddbb165931681569ec8;hb=1a8d79ec294aa9aaa97b4cf71356c0eb7a09bd40;hp=e746990fd7b2ffe5eb1a679d2e51e49f62388ee9;hpb=65e8b66d9b29d5a5fb58393885cb02c4d20d661d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index e746990fd..14bb91455 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -6,18 +6,74 @@ class schroot {
 	package { 'debootstrap':
 		ensure => installed,
 	}
-
-	file { '/etc/schroot/mount-defaults':
-		content => template('schroot/etc/schroot/mount-defaults.erb'),
-		require => Package['schroot'],
+	package { 'moreutils':
+		ensure => installed
 	}
+
 	file { '/etc/default/schroot':
 		source  => 'puppet:///modules/schroot/default-schroot',
 		require => Package['schroot']
 	}
 
+	file { '/etc/schroot/mount-defaults':
+		ensure => absent,
+	}
 	file { '/etc/schroot/default/nssdatabases':
 		source  => 'puppet:///modules/schroot/nssdatabases',
 		require => Package['schroot']
 	}
+
+	file { '/etc/schroot/setup.d/99porterbox-extra-apt-options':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-apt-options',
+		require => Package['schroot'],
+	}
+	file { '/etc/schroot/setup.d/99porterbox-extra-sources':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
+		require => Package['schroot'],
+	}
+	if ($::lsbmajdistrelease >= 8) {
+		file { '/etc/schroot/setup.d/99builddsourceslist':
+			mode    => '0555',
+			source  => 'puppet:///modules/schroot/schroot-setup.d/99builddsourceslist',
+			require => Package['schroot'],
+		}
+	}
+
+	file { '/usr/local/sbin/setup-dchroot':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/setup-dchroot',
+	}
+	file { '/usr/local/sbin/setup-all-dchroots':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/setup-all-dchroots',
+	}
+
+	file { '/etc/schroot/dsa':
+		ensure => directory,
+		require => Package['schroot'],
+	}
+	file { '/etc/schroot/dsa/default-mirror':
+		content => template('schroot/default-mirror.erb'),
+	}
+	file { '/etc/schroot/dsa/config':
+		source  => 'puppet:///modules/schroot/schroot-dsa/config',
+	}
+	file { '/etc/schroot/dsa/fstab':
+		content => template('schroot/schroot-dsa/fstab.erb'),
+		require => Package['schroot'],
+	}
+
+	file { '/etc/schroot/buildd/fstab':
+		content => template('schroot/schroot-buildd/fstab.erb'),
+		require => Package['schroot'],
+	}
+
+	if $has_srv_buildd {
+		file { '/etc/schroot/buildd/config':
+			content => "CHROOT_FILE_UNPACK_DIR=/srv/buildd/unpack\n",
+			require => Package['schroot'],
+		}
+	}
 }