X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=ea73380294107b69bca5cd86e3dc648ba3371e5f;hb=cf760168ec022b1fc8edb9c46d85b29a98af8ca6;hp=b76652c1159de7990c269aec58674783a1507a10;hpb=9573712862a431d238cf67894f4b422794eaa78f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index b76652c11..ea7338029 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,92 +1,25 @@
+# A debian.org buildd
 class buildd {
-
-	package { [
-			'schroot',
-			'sbuild'
-		]:
-		ensure  => installed,
-		require => [
-			File['/etc/apt/sources.list.d/buildd.debian.org.list'],
-			Exec['apt-get update']
-		]
-	}
-
-	package { 'apt-transport-https':
-		ensure => installed,
-	}
-	package { [
-			'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,
-	}
-
-	if $::lsbdistcodename in [squeeze,wheezy] {
-		$suite = $::lsbdistcodename
-	} else {
-		$suite = 'wheezy'
-	}
-
-	site::aptrepo { 'buildd.debian.org':
-		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
-		url        => 'https://buildd.debian.org/apt/',
-		suite      => $suite,
-		components => 'main',
-		require    => Package['apt-transport-https'],
-	}
-
-	if $::hostname in [alkman,porpora,zandonai] {
-		site::aptrepo { 'buildd.debian.org-proposed':
-			url        => 'https://buildd.debian.org/apt/',
-			suite      => "${suite}-proposed",
-			components => 'main',
-			require    => Package['apt-transport-https'],
-		}
-	}
-
-	if $::hostname in [krenek] {
-		site::aptrepo { 'buildd.debian.org-experimental':
-			url        => 'https://buildd.debian.org/apt/',
-			suite      => "${suite}-experimental",
-			components => 'main',
-			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']
-	}
-
+  # 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,
+    }
+
+    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
+    }
+  }
 }