Remove /etc/schroot/mount-defaults

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

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index e746990fd7b2ffe5eb1a679d2e51e49f62388ee9..731fd5b533d46cb38d5d1be5490dcdba1aa28585 100644 (file)
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -6,18 +6,46 @@ 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'],
+       }
+
+       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'],
+       }
 }