require => Package['dupload'],
}
site::linux_module { 'dm_snapshot': }
- ferm::module { 'nf_conntrack_ftp': }
+ include ferm::ftp_conntrack
}
site::aptrepo { 'buildd':
}
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',
require => Package['apt-transport-https'],
}
- if $::hostname in [alkman,porpora,zandonai] {
- site::aptrepo { 'buildd.debian.org-proposed':
- url => 'https://buildd.debian.org/apt/',
- suite => "${suite}-proposed",
- components => 'main',
- require => Package['apt-transport-https'],
- }
+ $buildd_prop_ensure = $::hostname ? {
+ /^(alkman|brahms|porpora|zandonai)$/ => 'present',
+ default => 'absent',
}
- if $::hostname in [krenek] {
- site::aptrepo { 'buildd.debian.org-experimental':
- url => 'https://buildd.debian.org/apt/',
- suite => "${suite}-experimental",
- components => 'main',
- require => Package['apt-transport-https'],
+ 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,
+ url => 'https://buildd.debian.org/apt/',
+ suite => "${suite}-proposed",
+ components => 'main',
+ require => [ Package['apt-transport-https'],
+ File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
+ }
# '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 => Site::Aptrepo['buildd.debian.org']
+ ensure => absent,
}
file { '/etc/cron.d/dsa-buildd':
source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
require => Package['debian.org']
}
- if $::lsbmajdistrelease >= 7 {
+ if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
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',
+ }
+ }
+ } else {
file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
- source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
+ source => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
mode => '0555',
}
- file { '/etc/cron.d/puppet-buildd-aptitude':
- content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+ }
+ 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",
+ }
+
}