class buildd {
+
+ # sigh, sort this mess out, kids
+ if $::lsbdistcodename in [lenny,squeeze] {
+ package { 'schroot':
+ ensure => installed,
+ }
+ #} else {
+ # package { 'schroot': ensure => held }
+ }
+
+ package { 'apt-transport-https':
+ ensure => installed,
+ }
package { [
- 'schroot',
'sbuild',
- 'apt-transport-https',
'debootstrap',
'dupload'
]:
- ensure => installed
+ ensure => installed,
+ require => [
+ File['/etc/apt/sources.list.d/db.debian.org.list'],
+ Exec['apt-get update']
+ ]
}
site::linux_module { 'dm_snapshot': }
+ ferm::module { 'nf_conntrack_ftp': }
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',
+ require => Package['apt-transport-https'],
}
- file { '/etc/apt/preferences.d/buildd':
- ensure => absent
+ # "bad" extension
+ file { '/etc/apt/preferences.d/buildd.debian.org':
+ ensure => absent,
}
- file { '/etc/schroot/mount-defaults':
- content => template('buildd/etc/schroot/mount-defaults.erb'),
- require => Package['sbuild'],
+ file { '/etc/apt/preferences.d/buildd':
+ content => template('buildd/etc/apt/preferences.d/buildd'),
+ before => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
+ ;
}
file { '/etc/schroot/mount-defaults':
content => template('buildd/etc/schroot/mount-defaults.erb'),