From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun, 8 Apr 2018 17:23:43 +0000 (+0200)
Subject: Remove buildd package on pybuildds based buildds
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0d7435ff446cc852321484e17c9913f874b54005;p=mirror%2Fdsa-puppet.git

Remove buildd package on pybuildds based buildds

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 33867d08f..212829354 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']: