From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 22 Jun 2019 15:39:46 +0000 (+0200)
Subject: More cleanup following the apt.buildd.debian.org removal
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=5b999b7f38f35f6dcd88090bf2b92c57a1d81e57

More cleanup following the apt.buildd.debian.org removal
---

diff --git a/modules/buildd/files/buildd.debian.org.gpg b/modules/buildd/files/buildd.debian.org.gpg
deleted file mode 100644
index 5db6d19eb..000000000
Binary files a/modules/buildd/files/buildd.debian.org.gpg and /dev/null differ
diff --git a/modules/debian_org/files/apt.preferences b/modules/debian_org/files/apt.preferences
index 65d11720d..7fbe20773 100644
--- a/modules/debian_org/files/apt.preferences
+++ b/modules/debian_org/files/apt.preferences
@@ -5,19 +5,3 @@ Explanation:
 Package: *
 Pin: release o=Debian Backports
 Pin-Priority: 200
-
-Package: sbuild
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: buildd
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: libsbuild-perl
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: *
-Pin: release o=buildd.debian.org
-Pin-Priority: -1
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 4957a2d0b..56bc38f7e 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -388,10 +388,6 @@ file=/etc/apache2/sites-available/www.debian.org
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
-file=/etc/apt/sources.list.d/buildd.list
-file=/etc/apt/sources.list.d/buildd.debian.org.list
-file=/etc/apt/sources.list.d/buildd.debian.org-proposed.list
-file=/etc/apt/sources.list.d/buildd.debian.org-experimental.list
 file=/etc/apt/sources.list.d/geoip.list
 file=/etc/apt/sources.list.d/backports.debian.org.list
 file=/etc/apt/sources.list.d/debian.org.list