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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 289edf28..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',
 	}
 
@@ -106,10 +108,78 @@ class buildd ($ensure=present) {
 		content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
 	}
 
-
 	if $has_srv_buildd {
 		file { '/etc/cron.d/puppet-update-buildd-schroots':
 			content  => "13 21 * * 0 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,
+	}
+
+	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"
+		}
+	}
 }