-class buildd {
+class buildd ($ensure=present) {
- package { [
- 'schroot',
- 'sbuild'
- ]:
- ensure => installed,
- require => [
- Exec['apt-get update']
- ]
- }
+ include schroot
- package { 'apt-transport-https':
+ package { 'sbuild':
ensure => installed,
+ tag => extra_repo,
}
- package { [
- 'debootstrap',
- 'dupload'
- ]:
+ package { 'libsbuild-perl':
ensure => installed,
+ tag => extra_repo,
+ before => Package['sbuild']
}
- site::linux_module { 'dm_snapshot': }
- ferm::module { 'nf_conntrack_ftp': }
+ package { 'apt-transport-https':
+ ensure => installed,
+ }
+ if $ensure == present {
+ package { 'dupload':
+ ensure => installed,
+ }
+ file { '/etc/dupload.conf':
+ source => 'puppet:///modules/buildd/dupload.conf',
+ require => Package['dupload'],
+ }
+ site::linux_module { 'dm_snapshot': }
+ ferm::module { 'nf_conntrack_ftp': }
+ }
site::aptrepo { 'buildd':
ensure => absent,
default => 'wheezy'
}
- if $suite == 'squeeze' {
- site::aptrepo { 'buildd.debian.org':
- key => 'puppet:///modules/buildd/buildd.debian.org.asc',
- url => 'https://buildd.debian.org/apt/',
- suite => $suite,
- components => 'main',
- require => Package['apt-transport-https'],
- before => Package[schroot,sbuild]
- }
+ site::aptrepo { 'buildd.debian.org':
+ key => 'puppet:///modules/buildd/buildd.debian.org.asc',
+ url => 'https://buildd.debian.org/apt/',
+ suite => $suite,
+ components => 'main',
+ require => Package['apt-transport-https'],
}
if $::hostname in [alkman,porpora,zandonai] {
}
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'),
- require => Package['sbuild'],
+ before => Site::Aptrepo['buildd.debian.org']
}
file { '/etc/cron.d/dsa-buildd':
source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
require => Package['debian.org']
}
- file { '/etc/dupload.conf':
- source => 'puppet:///modules/buildd/dupload.conf',
- require => Package['dupload'],
+
+ if $::lsbmajdistrelease >= 7 {
+ package { 'python-psutil':
+ ensure => installed,
+ }
+ file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+ source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
+ mode => '0555',
+ }
+ } else {
+ file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+ source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
+ mode => '0555',
+ }
}
- file { '/etc/default/schroot':
- source => 'puppet:///modules/buildd/default-schroot',
- require => Package['schroot']
+ file { '/etc/cron.d/puppet-buildd-aptitude':
+ content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
}
-
}