source => 'puppet:///modules/buildd/dupload.conf',
require => Package['dupload'],
}
+ package { 'buildd':
+ ensure => installed,
+ }
+ file { '/etc/buildd/buildd.conf':
+ source => 'puppet:///modules/buildd/buildd.conf',
+ require => Package['buildd'],
+ }
site::linux_module { 'dm_snapshot': }
include ferm::ftp_conntrack
}
}
$suite = $::lsbdistcodename ? {
- squeeze => $::lsbdistcodename,
wheezy => $::lsbdistcodename,
jessie => $::lsbdistcodename,
stretch => $::lsbdistcodename,
- undef => 'squeeze',
- default => 'wheezy'
+ undef => 'wheezy',
+ default => 'jessie'
+ }
+
+ $buildd_apt_url = $::debarchitecture ? {
+ /^sparc$/ => 'http://buildd.debian.org/apt/',
+ default => 'https://buildd.debian.org/apt/',
}
site::aptrepo { 'buildd.debian.org':
key => 'puppet:///modules/buildd/buildd.debian.org.gpg',
- url => 'https://buildd.debian.org/apt/',
+ url => $buildd_apt_url,
suite => $suite,
components => 'main',
require => Package['apt-transport-https'],
}
$buildd_prop_ensure = $::hostname ? {
- /^(alkman|porpora|zandonai)$/ => 'present',
+ /^(alkman)$/ => 'present',
default => 'absent',
}
require => Package['debian.org']
}
- if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
+ if ($::kernel == 'Linux') {
package { 'python-psutil':
ensure => installed,
}
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",
+ content => "13 21 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
}
}
group => buildd,
owner => buildd,
}
+ file { '/home/buildd/.gnupg':
+ ensure => directory,
+ mode => '700',
+ group => buildd,
+ owner => buildd,
+ }
+ file { '/home/buildd/.gnupg/gpg.conf':
+ content => "personal-digest-preferences SHA512\n",
+ group => buildd,
+ owner => buildd,
+ }
if ! $::buildd_key {
exec { 'create-buildd-key':