projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the right module name helps
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
a7c7011
..
79065a1
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-1,6
+1,13
@@
class buildd {
class buildd {
+
+ # sigh, sort this mess out, kids
+ if $::lsbdistcodename in [lenny,squeeze] {
+ package { 'schroot': ensure => installed }
+ } else {
+ package { 'schroot': ensure => held }
+ }
+
package { [
package { [
- 'schroot',
'sbuild',
'apt-transport-https',
'debootstrap',
'sbuild',
'apt-transport-https',
'debootstrap',
@@
-10,10
+17,14
@@
class buildd {
}
site::linux_module { 'dm_snapshot': }
}
site::linux_module { 'dm_snapshot': }
+ ferm::module { 'nf_conntrack_ftp': }
site::aptrepo { 'buildd':
site::aptrepo { 'buildd':
- content => template('buildd/etc/apt/sources.list.d/buildd.list.erb'),
- key => 'puppet:///modules/buildd/buildd.debian.org.asc',
+ ensure => absent,
+ }
+ site::aptrepo { 'buildd.debian.org':
+ template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
+ key => 'puppet:///modules/buildd/buildd.debian.org.asc',
}
file { '/etc/apt/preferences.d/buildd':
}
file { '/etc/apt/preferences.d/buildd':