}
$suite = $::lsbdistcodename ? {
- squeeze => $::lsbdistcodename,
- wheezy => $::lsbdistcodename,
+ squeeze => $::lsbdistcodename,
+ wheezy => $::lsbdistcodename,
+ jessie => $::lsbdistcodename,
+ stretch => $::lsbdistcodename,
undef => 'squeeze',
default => 'wheezy'
}
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_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"
+ }
+ }
}