X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=9bbbeea2b0a76f87464da3be34c6d4636ed6e430;hb=01cd3002a8cd5624522fbe5ac90b90e2a7149cde;hp=33867d08fef38d4436347bf817d6d117669f47ea;hpb=a2aa1e123f727332588cd9b784b5da4d1c3cade3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 33867d08f..9bbbeea2b 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -105,23 +105,8 @@ class buildd ($ensure=present) {
 			#
 			# pybuildd configuration
 			#
-
-			# We still rely on buildd for some features. Install the package
-			# but keep it disabled.
 			package { 'buildd':
-				ensure => installed,
-			}
-			service { 'buildd':
-				enable => false,
-				ensure => 'stopped',
-			}
-			file { '/home/buildd/NO-DAEMON-PLEASE':
-				ensure => present,
-			}
-			file { '/home/buildd/.forward':
-				content  => "|/usr/bin/buildd-mail\n",
-				group   => buildd,
-				owner   => buildd,
+				ensure => purged,
 			}
 
 			package { ['python3-retrying', 'python3-yaml']:
@@ -155,6 +140,15 @@ class buildd ($ensure=present) {
 			file { '/etc/systemd/journald.conf.d/persistency.conf':
 				source => 'puppet:///modules/systemd/persistency.conf',
 			}
+
+			# Make sure that the build directory have the correct permissions.
+			# This should go away once pybuildd issue #3 is solved.
+			file { '/home/buildd/build':
+				ensure  => directory,
+				mode    => '2750',
+				group   => buildd,
+				owner   => buildd,
+			}
 		} else {
 			#
 			# buildd configuration
@@ -223,6 +217,9 @@ class buildd ($ensure=present) {
 					ensure => absent,
 				}
 			} else {
+				package { 'apt-transport-https':
+					ensure => installed,
+				}
 				site::aptrepo { 'buildd.debian.org':
 					key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
 					url        => 'https://apt.buildd.debian.org/',