projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exim blacklist: add more recent spammers
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
init.pp
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
8f68e69
..
ea73380
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-1,22
+1,25
@@
+# A debian.org buildd
class buildd {
class buildd {
- package {
- "sbuild": ensure => installed;
- "buildd": ensure => installed;
- "buildd-builder-meta": ensure => installed;
- "apt-transport-https": ensure => installed;
- "debootstrap": ensure => installed;
- }
+ # Do nothing until we get the buildd user from ldap
+ if $::buildd_user_exists {
+ # home directory
+ file { '/home/buildd':
+ ensure => directory,
+ mode => '2755',
+ group => buildd,
+ owner => buildd,
+ }
- file {
- "/etc/apt/sources.list.d/buildd.list":
- source => "puppet:///files/etc/apt/sources.list.d/buildd.list",
- require => Package["apt-transport-https"]
- ;
+ include buildd::schroot
+ include buildd::dupload
+ include buildd::aptitude
+ include buildd::gnupg
+ include buildd::ssh
- "/etc/apt/trusted-keys.d/buildd.debian.org.asc":
- source => "puppet:///buildd/buildd.debian.org.asc",
- mode => 664,
- notify => Exec["apt-keys-update"],
- ;
-
}
+ if $::hostname in [x86-grnet-01,x86-grnet-02,zani] {
+ include buildd::pybuildd
+ } else {
+ include buildd::buildd
+ }
+ }
}
}