X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=f821eac746d837366076199dfc8220f3750cf3e3;hb=b529b139a60ea8355089511737c8264185d8d074;hp=c9af7e6d4eeceb157c6261f79e696533611ecb6a;hpb=90a02692e150402b46ed74a4684feb01f719bce6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index c9af7e6d4..f821eac74 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -1,65 +1,184 @@
-class buildd {
+class buildd ($ensure=present) {
+	# Do nothing until we get the buildd user from ldap
+	if $::buildd_user_exists {
+		include schroot
 
-	# sigh, sort this mess out, kids
-	if $::lsbdistcodename in [lenny,squeeze] {
-		package { 'schroot':
+		package { 'sbuild':
 			ensure => installed,
+			tag    => extra_repo,
+		}
+		package { 'libsbuild-perl':
+			ensure => installed,
+			tag    => extra_repo,
+			before => Package['sbuild']
 		}
-	#} 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']
-		]
-	}
+		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'],
+			}
+			package { 'buildd':
+				ensure => installed,
+			}
+			file { '/etc/buildd/buildd.conf':
+				source  => 'puppet:///modules/buildd/buildd.conf',
+				require => Package['buildd'],
+			}
+			file { '/etc/sbuild/sbuild.conf':
+				source  => 'puppet:///modules/buildd/sbuild.conf',
+				require => Package['sbuild'],
+			}
+			include ferm::ftp_conntrack
+		}
 
-	site::linux_module { 'dm_snapshot': }
-	ferm::module { 'nf_conntrack_ftp': }
+		site::aptrepo { 'buildd':
+			ensure => absent,
+		}
 
-	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'],
-	}
+		$suite = $::lsbdistcodename ? {
+			wheezy   => $::lsbdistcodename,
+			jessie   => $::lsbdistcodename,
+			stretch  => $::lsbdistcodename,
+			undef   => 'wheezy',
+			default => 'jessie'
+		}
 
-	# "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']
-	}
+		site::aptrepo { 'buildd.debian.org':
+			key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
+			url        => 'https://apt.buildd.debian.org/',
+			suite      => $suite,
+			components => 'main',
+			require    => Package['apt-transport-https'],
+		}
+
+		file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+			content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
+		}
+
+		# '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 ($::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",
+		}
+
+		service { 'buildd':
+			enable => false,
+			ensure => 'stopped',
+		}
+
+		if $has_srv_buildd {
+			file { '/etc/cron.d/puppet-update-buildd-schroots':
+				content  => "13 21 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
+			}
+		}
+
+		file { '/home/buildd':
+			ensure  => directory,
+			mode    => '2755',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/build':
+			ensure  => directory,
+			mode    => '2750',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/logs':
+			ensure  => directory,
+			mode    => '2750',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/old-logs':
+			ensure  => directory,
+			mode    => '2750',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/upload-security':
+			ensure  => directory,
+			mode    => '2750',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/stats':
+			ensure  => directory,
+			mode    => '2755',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/stats/graphs':
+			ensure  => directory,
+			mode    => '2755',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/upload':
+			ensure  => directory,
+			mode    => '2755',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/.forward':
+			content  => "|/usr/bin/buildd-mail\n",
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/.gnupg':
+			ensure  => directory,
+			mode    => '700',
+			group   => buildd,
+			owner   => buildd,
+		}
+		file { '/home/buildd/.gnupg/gpg.conf':
+			content  => "personal-digest-preferences SHA512\n",
+			group   => buildd,
+			owner   => buildd,
+		}
+
+		if ! $::buildd_key {
+			exec { 'create-buildd-key':
+				command => '/bin/su - buildd -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
+				onlyif  => '/usr/bin/getent passwd buildd > /dev/null && ! [ -e /home/buildd/.ssh/id_rsa ]'
+			}
+		}
+
+
+		exec { 'add-buildd-user-to-sbuild':
+			command => 'adduser buildd sbuild',
+			onlyif  => "getent group sbuild > /dev/null && ! getent group sbuild | grep '\\<buildd\\>' > /dev/null"
+		}
+	}
 }