source => 'puppet:///modules/buildd/buildd.conf',
require => Package['buildd'],
}
- if ($::lsbmajdistrelease >= '8') {
- file { '/etc/sbuild/sbuild.conf':
- source => 'puppet:///modules/buildd/sbuild.conf',
- require => Package['sbuild'],
- }
- } else {
- file { '/etc/sbuild/sbuild.conf':
- source => 'puppet:///modules/buildd/sbuild.conf.wheezy',
- require => Package['sbuild'],
- }
+ file { '/etc/sbuild/sbuild.conf':
+ source => 'puppet:///modules/buildd/sbuild.conf',
+ require => Package['sbuild'],
}
include ferm::ftp_conntrack
}
default => 'jessie'
}
- site::aptrepo { 'buildd.debian.org':
- key => 'puppet:///modules/buildd/buildd.debian.org.gpg',
- url => 'https://apt.buildd.debian.org/',
- suite => $suite,
- components => 'main',
- require => Package['apt-transport-https'],
+ if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+ site::aptrepo { 'buildd.debian.org':
+ ensure => absent,
+ }
+ } else {
+ site::aptrepo { 'buildd.debian.org':
+ key => 'puppet:///modules/buildd/buildd.debian.org.gpg',
+ url => 'https://apt.buildd.debian.org/',
+ suite => $suite,
+ components => 'main',
+ require => Package['apt-transport-https'],
+ }
}
file { '/etc/apt/apt.conf.d/puppet-https-buildd':
package { 'python-psutil':
ensure => installed,
}
- if ($::lsbmajdistrelease >= '8') {
- 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.wheezy',
- mode => '0555',
- }
+ 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':
if $has_srv_buildd {
file { '/etc/cron.d/puppet-update-buildd-schroots':
- content => "13 21 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
+ content => "13 22 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
}
}