From 319a20e7ac6487c37735e1a43c8e5a0f2409e857 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 8 Apr 2014 15:30:37 +0200
Subject: [PATCH] Update db.d.o key

---
 modules/debian-org/files/db.debian.org.asc |  19 -------------------
 modules/debian-org/files/db.debian.org.gpg | Bin 0 -> 557 bytes
 modules/debian-org/manifests/init.pp       |   2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 modules/debian-org/files/db.debian.org.asc
 create mode 100644 modules/debian-org/files/db.debian.org.gpg

diff --git a/modules/debian-org/files/db.debian.org.asc b/modules/debian-org/files/db.debian.org.asc
deleted file mode 100644
index ab26152bc..000000000
--- a/modules/debian-org/files/db.debian.org.asc
+++ /dev/null
@@ -1,19 +0,0 @@
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQGiBEf4BP0RBACfXnRhBb9HKiA3h5A1tDnluVwfkSuDX4ZXdVAuMZapdOm8r9ug
-9zE/dDGWPWja+DArAPZ/i3BFvlMewmden/IFbQKtXluQVIC4GL1RBMwrtWsZzo0g
-picl3CYWDAYjRdg4WppUc9FawwGw081FlLGDv7eYRO3+8uGUHfr+SD7CwwCgxJK6
-SvDX6M2Ifuq8WmgWWrVFyakD/ipdxd3NPIcnl1JTO2NjbOJYKpZMl6v0g+1OofSq
-CAKTO8ymc0z6SF1j/4mWe1W76wvTpOhOUgn2WO7SQHZaujb/3z+yAJedfbCDgq0S
-H/T2qbQTzv+woAjyR/e2Zpsc2DRfqO/8aCw1Jx8N3UbH9MBPYlYlyCnSra1OAyXW
-VvC0A/9nT/k6VIFBF0Oq2WwmzOLptOqg61WrnxBr3GIe503++p88tOwlCJlL0uZZ
-k68m3m5t7WDtQK4fHQwLramb9AqtBPhiEaXU5bXk77RYE54EeEH9Z4H4YSMMkdYU
-gLG5CZI2jprxAZew1mHKROv+15jxYd+BZCrORmpWn5g7N+TC5rQeZGIuZGViaWFu
-Lm9yZyBhcmNoaXZlIGtleSAyMDA4iGYEExECACYCGwMGCwkIBwMCBBUCCAMEFgID
-AQIeAQIXgAUCT4AM/gUJC0pu7gAKCRC+p88QvSsO4KcGAKCCMehYEKkgFQ5yzzLs
-OSYtvPlLLQCgmUybuUPhd5dzeSL7AA2N666p5Sc=
-=jdsl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/modules/debian-org/files/db.debian.org.gpg b/modules/debian-org/files/db.debian.org.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..4e286a8f4ff885e93c8c7773c9f7737d55e57c6c
GIT binary patch
literal 557
zcmV+|0@D4N0ipy)_yqkC1OT62bYTU*M=BsUhmbY2Ipw)rACW7AUxrt8P%bf+sdVYQ
zuiK#aF+X%MmOW_N_%JH~_J50TMZQxW!e?He@&#=ItzKJ@RDie`y-@_rE46DG&W#|Z
zCnek_77PX>Mc6o6npAVqTEhXb)6GScv4g+2m_+UV^5K*n`u<2h!ovWd#FDy7@Ym?g
zh<@t4T4)wpwMEIP1O6&q#of(3hbNa(Q#)g0Y~oldmQ0tc^n>kAq4cT<0+Tz;rgKdC
zNL^$9iI#g+yXy<nr07mk3HDg-(m-}vx;FpcKe7Oqoqe!_f~^uC^!BN=6VCszpa}9u
z_qJx69N08psPFt}EHx(|4c$h^^uSMIRwc+O(ygsd10~j0@U#Q}XHWS$RDnSkL#o+q
zCd}gLwCbSiRjZ#6YusWU=S}|lpFFheB?y^I(&kx{uO{AZZS7#~K&~Gh3=6HPoAe5;
z1o&bRrPSrM<nOdt6P^TkLH%ce_+cXqk=7J|vAGG7HjbL{0hh4WVai17{@0lCVc&sd
zD$Yh~R-c$VH{`<Rv>s$)E@Wk5X<=?IZ*pfKVRB<=X?A5GYh`&LGB7YWh-L&65dr`v
z0viJc3ke7Z0|EpU0tf>H76JnS0v-VZ7k~u<Q$zW>1qlxhTe|=X2@t-g&k(&U4&aUw
v0G%Dau;f%`TpOr`8TQEACXDGlsR00>g^Gt3x&_@BRg7$`8-DFCf}tnX#h3sn

literal 0
HcmV?d00001

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 0bccab42c..840efc1f9 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -142,7 +142,7 @@ class debian-org {
 		url        => 'http://db.debian.org/debian-admin',
 		suite      => 'lenny',
 		components => 'main',
-		key        => 'puppet:///modules/debian-org/db.debian.org.asc',
+		key        => 'puppet:///modules/debian-org/db.debian.org.db',
 	}
 
 	augeas { 'inittab_replicate':
-- 
2.20.1