eximconf: more RBLs for the default set

[mirror/dsa-puppet.git] / modules / buildd / manifests / init.pp

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 227ac26..ea73380 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,65 +1,25 @@
+# A debian.org buildd
 class buildd {
+  # 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,
+    }
 
-       # sigh, sort this mess out, kids
-       if $::lsbdistcodename in [lenny,squeeze] {
-               package { 'schroot':
-                       ensure => installed,
-               }
-       } else {
-               // package { 'schroot': ensure => held }
-       }
-
-       package { 'apt-transport-https':
-               ensure => installed,
-       }
-       package { [
-                       'sbuild',
-                       'debootstrap',
-                       'dupload'
-               ]:
-               ensure => installed,
-               require => [
-                       File['/etc/apt/sources.list.d/db.debian.org.list'],
-                       Exec['apt-get update']
-               ]
-       }
-
-       site::linux_module { 'dm_snapshot': }
-       ferm::module { 'nf_conntrack_ftp': }
-
-       site::aptrepo { 'buildd':
-               ensure => absent,
-       }
-       site::aptrepo { 'buildd.debian.org':
-               template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
-               key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
-               require  => Package['apt-transport-https'],
-       }
-
-       # "bad" extension
-       file { '/etc/apt/preferences.d/buildd.debian.org':
-               ensure => absent,
-       }
-       file { '/etc/apt/preferences.d/buildd':
-               content => template('buildd/etc/apt/preferences.d/buildd'),
-               before  => File["/etc/apt/sources.list.d/buildd.debian.org.list"],
-               ;
-       }
-       file { '/etc/schroot/mount-defaults':
-               content => template('buildd/etc/schroot/mount-defaults.erb'),
-               require => Package['sbuild'],
-       }
-       file { '/etc/cron.d/dsa-buildd':
-               source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
-               require => Package['debian.org']
-       }
-       file { '/etc/dupload.conf':
-               source  => 'puppet:///modules/buildd/dupload.conf',
-               require => Package['dupload'],
-       }
-       file { '/etc/default/schroot':
-               source  => 'puppet:///modules/buildd/default-schroot',
-               require => Package['schroot']
-       }
+    include buildd::schroot
+    include buildd::dupload
+    include buildd::aptitude
+    include buildd::gnupg
+    include buildd::ssh
 
+    if $::hostname in [x86-grnet-01,x86-grnet-02,zani] {
+      include buildd::pybuildd
+    } else {
+      include buildd::buildd
+    }
+  }
 }