X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=52317ddf1cb0395c319dbfc6a152885619910ace;hb=ad0dff64a738b14f3223b1685295cf341846d772;hp=0c109e069039c5bf8823027def276e66a0d2109f;hpb=cafaf468d5235a19566af088408834e2d58c8263;p=dsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 0c109e06..52317ddf 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -32,8 +32,10 @@ class buildd ($ensure=present) {
 	}
 
 	$suite = $::lsbdistcodename ? {
-		squeeze => $::lsbdistcodename,
-		wheezy  => $::lsbdistcodename,
+		squeeze  => $::lsbdistcodename,
+		wheezy   => $::lsbdistcodename,
+		jessie   => $::lsbdistcodename,
+		stretch  => $::lsbdistcodename,
 		undef   => 'squeeze',
 		default => 'wheezy'
 	}
@@ -47,7 +49,7 @@ class buildd ($ensure=present) {
 	}
 
 	$buildd_prop_ensure = $::hostname ? {
-		/^(alkman|brahms|porpora|zandonai)$/ => 'present',
+		/^(alkman|porpora|zandonai)$/ => 'present',
 		default => 'absent',
 	}
 
@@ -173,4 +175,11 @@ class buildd ($ensure=present) {
 		}
 	}
 
+
+	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"
+		}
+	}
 }