- # 'bad' extension
- file { '/etc/apt/preferences.d/buildd.debian.org':
- ensure => absent,
- }
- 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'],
- }
- 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'],
- }
- file { '/etc/default/schroot':
- source => 'puppet:///modules/buildd/default-schroot',
- require => Package['schroot']
- }
+ 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':
+ content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
+ }
+
+ # 'bad' extension
+ file { '/etc/apt/preferences.d/buildd.debian.org':
+ ensure => absent,
+ }
+ file { '/etc/apt/preferences.d/buildd':
+ ensure => absent,
+ }
+ file { '/etc/cron.d/dsa-buildd': ensure => absent, }
+ concat::fragment { 'dsa-puppet-stuff--buildd':
+ target => '/etc/cron.d/dsa-puppet-stuff',
+ source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
+ require => Package['debian.org']
+ }
+
+ if ($::kernel == 'Linux') {
+ 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/cron.d/puppet-buildd-aptitude': ensure => absent }
+ concat::fragment { 'dsa-puppet-stuff--buildd-aptitude-killer':
+ target => '/etc/cron.d/dsa-puppet-stuff',
+ content => @(EOF)
+ */5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill
+ | EOF
+ }
+
+ service { 'buildd':
+ enable => false,
+ ensure => 'stopped',
+ }