eximconf: reject mails with clearly faked Received: headers

[mirror/dsa-puppet.git] / modules / schroot / manifests / init.pp

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 2e22db3..ee24dc2 100644 (file)
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -1,4 +1,6 @@
 class schroot {
+       $mirror = lookup('apt::sources::debian::location', { 'merge' => { 'strategy' => 'first'}} )
+
        package { 'schroot':
                ensure => installed,
                tag    => extra_repo,
@@ -16,8 +18,7 @@ class schroot {
        }
 
        file { '/etc/schroot/mount-defaults':
-               content => template('schroot/mount-defaults.erb'),
-               require => Package['schroot'],
+               ensure => absent,
        }
        file { '/etc/schroot/default/nssdatabases':
                source  => 'puppet:///modules/schroot/nssdatabases',
@@ -34,13 +35,29 @@ class schroot {
                source  => 'puppet:///modules/schroot/schroot-setup.d/99porterbox-extra-sources',
                require => Package['schroot'],
        }
+       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'),
+               content => @("EOT"),
+                       $mirror
+                       | EOT
        }
        file { '/etc/schroot/dsa/config':
                source  => 'puppet:///modules/schroot/schroot-dsa/config',
@@ -49,4 +66,16 @@ class schroot {
                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'],
+               }
+       }
 }