projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move setup-* from porterbox to schroot module
[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
..
d9ca261
100644
(file)
--- a/
modules/schroot/manifests/init.pp
+++ b/
modules/schroot/manifests/init.pp
@@
-16,8
+16,7
@@
class schroot {
}
file { '/etc/schroot/mount-defaults':
}
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',
}
file { '/etc/schroot/default/nssdatabases':
source => 'puppet:///modules/schroot/nssdatabases',
@@
-35,6
+34,15
@@
class schroot {
require => Package['schroot'],
}
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':
ensure => directory,
require => Package['schroot'],
@@
-49,4
+57,9
@@
class schroot {
content => template('schroot/schroot-dsa/fstab.erb'),
require => Package['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'],
+ }
}
}