From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 8 Apr 2014 13:33:24 +0000 (+0200)
Subject: and dearmor buildd.d.o gpgkey
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ca3d855e37df6d73833c766f9a2a7bd5ac4c0402;hp=7a0b5ea7181cc3ddfc465423a7e51f04ee4c2a97;p=mirror%2Fdsa-puppet.git

and dearmor buildd.d.o gpgkey
---

diff --git a/modules/buildd/files/buildd.debian.org.asc b/modules/buildd/files/buildd.debian.org.asc
deleted file mode 100644
index 9cc0e3674..000000000
--- a/modules/buildd/files/buildd.debian.org.asc
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQENBFFBpEgBCACh0iu3BC2RKu9DOO9lMDw4U7pMHodeqAVg5QC9+looC5oKqSJy
-feWXbc8K1Zc7GJwvSirLnj4T6RpQr0pDSmfGYKH4xBfTrH9lhMOf1vsj0m/m6xoK
-pRxouQUUItSB0jrJSqMmJxeymtQVc9m0+r+syOSYGVhHPSLSEiQDxXWEH2n/Fktz
-EQNutWHcsfzUfJYSZr6nbBzbOJimm0SOxR4nFVPB0Iqv7cRpRKZQe8hmvWnZ5SWn
-AAruqOoLYnUA+0ESCrx9N811FbjpWYoX48+CobSWnyoHcywM8synfaBoJKCN8fuW
-gwb/rz8ZDqyZUDN16TXc+Z2kNRfxs4Anyq//ABEBAAG0J2J1aWxkZC5kZWJpYW4u
-b3JnIGFyY2hpdmUga2V5IDIwMDkvMjAxMIkBPgQTAQIAKAUCUUGkSAIbAwUJA8Jn
-AAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQgrcdo/1EWMtUNQf/T6DcLoDi
-WjoitT2TJMq+UCLxIqJgKTsDNEMxir4Z5tRdu2az4yTaSoXfnE8itTzivkhINwO4
-tmLXJP2Sn+np37eNljvkjZzX/2g0zCtmwIQR15bNFs8Og4xblNpZ34ick0sRlBf3
-C40nrjDkEaanEwzTxqhsmZ3iitVhxf/ciwBmHHTpvAerX12dPkjvLxtuTx1GXF+N
-WnRMZAmKhWuxZpODAroVrITUYT9w8cHumAnsHGNIsSn6nnedHKUsAIxoec2NaJ4u
-jeu8I3BkEJ2rC8O6h+WoylFBG7fjrHD/AGbd5Wmu1UYOvu3juRTwrA7ZeZxHkVDD
-FCSzOPFMNer4KQ==
-=eBkk
------END PGP PUBLIC KEY BLOCK-----
diff --git a/modules/buildd/files/buildd.debian.org.gpg b/modules/buildd/files/buildd.debian.org.gpg
new file mode 100644
index 000000000..468a1fdff
Binary files /dev/null and b/modules/buildd/files/buildd.debian.org.gpg differ
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 7eccfad7c..7b49fdfe6 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -39,7 +39,7 @@ class buildd ($ensure=present) {
 	}
 
 	site::aptrepo { 'buildd.debian.org':
-		key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+		key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
 		url        => 'https://buildd.debian.org/apt/',
 		suite      => $suite,
 		components => 'main',