X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=e168abc33354cf6d6e07e768d6458361ca5857fc;hb=e079e7b6a8002a0e185e904e7b4ccf762ab8746d;hp=ff89158d512d9a4c68a6f4071ccae12909694bc4;hpb=9392d5a1d73984ac11e05e1cbf54b80d37cb6a0f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index ff89158d5..e168abc33 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -32,13 +32,21 @@ class buildd ($ensure=present) {
 	}
 
 	$suite = $::lsbdistcodename ? {
-		squeeze => $::lsbdistcodename,
-		wheezy  => $::lsbdistcodename,
+		squeeze  => $::lsbdistcodename,
+		wheezy   => $::lsbdistcodename,
+		jessie   => $::lsbdistcodename,
+		stretch  => $::lsbdistcodename,
 		undef   => 'squeeze',
 		default => 'wheezy'
 	}
 
+	$buildd_apt_main_ensure = $::hostname ? {
+		/^(schroeder|sompek|stadler)$/ => 'absent',
+		default => 'present',
+	}
+
 	site::aptrepo { 'buildd.debian.org':
+		ensure     => $buildd_apt_main_ensure,
 		key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
 		url        => 'https://buildd.debian.org/apt/',
 		suite      => $suite,
@@ -47,7 +55,7 @@ class buildd ($ensure=present) {
 	}
 
 	$buildd_prop_ensure = $::hostname ? {
-		/^(alkman|brahms|porpora|zandonai)$/ => 'present',
+		/^(alkman|zandonai)$/ => 'present',
 		default => 'absent',
 	}
 
@@ -142,6 +150,12 @@ class buildd ($ensure=present) {
 		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',
@@ -160,11 +174,18 @@ class buildd ($ensure=present) {
 		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 ]'
-                }
-        }
+	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 ]'
+		}
+	}
+
 
+	if $::buildd_user_exists {
+		exec { 'add-buildd-user-to-sbuild':
+			command => 'adduser buildd sbuild',
+			onlyif  => "getent group sbuild > /dev/null && ! getent group sbuild | grep '\\<buildd\\>' > /dev/null"
+		}
+	}
 }