X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=ea73380294107b69bca5cd86e3dc648ba3371e5f;hb=489765c975281e4d065b8bf215c49edae5d979d3;hp=01dca34d5b315b03a4238547d82b90b34743ff3b;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 01dca34d5..ea7338029 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,43 +1,25 @@
+# A debian.org buildd
 class buildd {
-	package { [
-			'schroot',
-			'sbuild',
-			'apt-transport-https',
-			'debootstrap',
-			'dupload'
-		]:
-			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,
+    }
 
-	site::linux_module { 'dm_snapshot': }
-
-	site::aptrepo { 'buildd':
-		content => 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/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
+    }
+  }
 }