X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=ea73380294107b69bca5cd86e3dc648ba3371e5f;hb=f79fdb6bb13b6eb8a0c8b0dcf117a2c3e0e241c6;hp=220c9a8b5d0d349eb021b419f5e7e38740883930;hpb=687e6b3a071bfef37574492e3931ce4766837714;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 220c9a8b5..ea7338029 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,96 +1,25 @@
-class buildd ($ensure=present) {
-
-	include schroot
-
-	package { 'sbuild':
-		ensure => installed,
-		tag    => extra_repo,
-	}
-	package { 'libsbuild-perl':
-		ensure => installed,
-		tag    => extra_repo,
-		before => Package['sbuild']
-	}
-
-	package { 'apt-transport-https':
-		ensure => installed,
-	}
-	if $ensure == present {
-		package { 'dupload':
-			ensure => installed,
-		}
-		file { '/etc/dupload.conf':
-			source  => 'puppet:///modules/buildd/dupload.conf',
-			require => Package['dupload'],
-		}
-		site::linux_module { 'dm_snapshot': }
-		include ferm::ftp_conntrack
-	}
-
-	site::aptrepo { 'buildd':
-		ensure => absent,
-	}
-
-	$suite = $::lsbdistcodename ? {
-		squeeze => $::lsbdistcodename,
-		wheezy  => $::lsbdistcodename,
-		undef   => 'squeeze',
-		default => 'wheezy'
-	}
-
-	site::aptrepo { 'buildd.debian.org':
-		key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-		url        => 'https://buildd.debian.org/apt/',
-		suite      => $suite,
-		components => 'main',
-		require    => Package['apt-transport-https'],
-	}
-
-	$buildd_prop_ensure = $::hostname ? {
-		/^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
-		default => 'absent',
-	}
-
-	file { '/etc/apt/apt.conf.d/puppet-https-buildd':
-		content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/servicecerts/buildd.debian.org.crt\";\n",
-		#require => File['/etc/ssl/certs/buildd.debian.org.crt']
-	}
-	site::aptrepo { 'buildd.debian.org-proposed':
-		ensure     => $buildd_prop_ensure,
-		url        => 'https://buildd.debian.org/apt/',
-		suite      => "${suite}-proposed",
-		components => 'main',
-		require    => [ Package['apt-transport-https'],
-		                File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
-	}
-
-	# 'bad' extension
-	file { '/etc/apt/preferences.d/buildd.debian.org':
-		ensure => absent,
-	}
-	file { '/etc/apt/preferences.d/buildd':
-		ensure => absent,
-	}
-	file { '/etc/cron.d/dsa-buildd':
-		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
-		require => Package['debian.org']
-	}
-
-	if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
-		package { 'python-psutil':
-			ensure => installed,
-		}
-		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-			source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
-			mode    => '0555',
-		}
-	} else {
-		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-			source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
-			mode    => '0555',
-		}
-	}
-	file { '/etc/cron.d/puppet-buildd-aptitude':
-		content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
-	}
+# 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,
+    }
+
+    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
+    }
+  }
 }