$suite = $::lsbdistcodename ? {
squeeze => $::lsbdistcodename,
wheezy => $::lsbdistcodename,
+ jessie => $::lsbdistcodename,
undef => 'squeeze',
default => 'wheezy'
}
if ($::lsbmajdistrelease >= 8) {
file { '/etc/apt/apt.conf.d/puppet-https-buildd':
- content => "Acquire::https::buildd.debian.org::CaInfo \"/usr/share/ca-certificates/mozilla/AddTrust_External_Root.crt\";\n",
+ 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':
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':
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/stats':
+ 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",
+ group => buildd,
+ owner => buildd,
+ }
+
+ if ! $::buildd_key {
+ exec { 'create-buildd-key':
+ command => '/bin/su - buildd -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
+ onlyif => '/usr/bin/getent passwd buildd > /dev/null && ! [ -e /home/buildd/.ssh/id_rsa ]'
+ }
+ }
+
+
+ if $::buildd_user_exists {
+ exec { 'add-buildd-user-to-sbuild':
+ command => 'adduser buildd sbuild',
+ onlyif => "getent group sbuild > /dev/null && ! getent group sbuild | grep '\\<buildd\\>' > /dev/null"
+ }
+ }
}