X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=ea73380294107b69bca5cd86e3dc648ba3371e5f;hb=0cf65a8865b70976c5f1be158518e794036646a9;hp=364267a716a6d4184625288774998f317f175e9d;hpb=fa4000517ba3ff1344bb0b9fdc186708d740bc4a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 364267a71..ea7338029 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,49 +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 { [
-			'sbuild',
-			'apt-transport-https',
-			'debootstrap',
-			'dupload'
-		]:
-			ensure => installed
-	}
-
-	site::linux_module { 'dm_snapshot': }
-
-	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',
-	}
-
-	file { '/etc/apt/preferences.d/buildd':
-		ensure  => absent
-	}
-	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
+    }
+  }
 }