}
site::aptrepo { 'buildd.debian.org':
- key => 'puppet:///modules/buildd/buildd.debian.org.asc',
+ key => 'puppet:///modules/buildd/buildd.debian.org.gpg',
url => 'https://buildd.debian.org/apt/',
suite => $suite,
components => 'main',
}
$buildd_prop_ensure = $::hostname ? {
- /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+ /^(alkman|brahms|porpora|zandonai)$/ => 'present',
default => 'absent',
}
- file { '/etc/apt/apt.conf.d/puppet-https-buildd':
- content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/certs/buildd.debian.org.crt\";\n",
- #require => File['/etc/ssl/certs/buildd.debian.org.crt']
+ if ($::lsbmajdistrelease >= 8) {
+ file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+ content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
+ }
+ } else {
+ file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+ content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/servicecerts/buildd.debian.org.crt\";\n",
+ }
}
site::aptrepo { 'buildd.debian.org-proposed':
ensure => $buildd_prop_ensure,
package { 'python-psutil':
ensure => installed,
}
- file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
- source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
- mode => '0555',
+ 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',
+ }
}
} else {
file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
file { '/etc/cron.d/puppet-buildd-aptitude':
content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
}
+
+ if $has_srv_buildd {
+ file { '/etc/cron.d/puppet-update-buildd-schroots':
+ content => "13 21 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
+ }
+ }
+
+ file { '/home/buildd':
+ ensure => directory,
+ mode => '2755',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/build':
+ ensure => directory,
+ mode => '2750',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/logs':
+ ensure => directory,
+ mode => '2750',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/old-logs':
+ ensure => directory,
+ mode => '2750',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/upload-security':
+ ensure => directory,
+ mode => '2750',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/status':
+ ensure => directory,
+ mode => '2755',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/stats/graphs':
+ ensure => directory,
+ mode => '2755',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/upload':
+ ensure => directory,
+ mode => '2755',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/.forward':
+ content => "|/usr/bin/buildd-mail\n",
+ }
+
}