projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log rsync for syncproxy and security to dedicated logs
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
f4547fa
..
b58bd01
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-23,6
+23,13
@@
class buildd ($ensure=present) {
source => 'puppet:///modules/buildd/dupload.conf',
require => Package['dupload'],
}
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
}
site::linux_module { 'dm_snapshot': }
include ferm::ftp_conntrack
}
@@
-32,22
+39,29
@@
class buildd ($ensure=present) {
}
$suite = $::lsbdistcodename ? {
}
$suite = $::lsbdistcodename ? {
- squeeze => $::lsbdistcodename,
- wheezy => $::lsbdistcodename,
+ squeeze => $::lsbdistcodename,
+ wheezy => $::lsbdistcodename,
+ jessie => $::lsbdistcodename,
+ stretch => $::lsbdistcodename,
undef => 'squeeze',
default => 'wheezy'
}
undef => 'squeeze',
default => 'wheezy'
}
+ $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',
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 ? {
suite => $suite,
components => 'main',
require => Package['apt-transport-https'],
}
$buildd_prop_ensure = $::hostname ? {
- /^(alkman
|brahms|porpora|zandonai
)$/ => 'present',
+ /^(alkman)$/ => 'present',
default => 'absent',
}
default => 'absent',
}
@@
-108,7
+122,7
@@
class buildd ($ensure=present) {
if $has_srv_buildd {
file { '/etc/cron.d/puppet-update-buildd-schroots':
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",
}
}
}
}
@@
-166,11
+180,18
@@
class buildd ($ensure=present) {
owner => 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_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"
+ }
+ }
}
}