From ee36bdfbb7ad677b199c6b600370f8db6fad4e24 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 26 Apr 2009 19:19:44 +0200 Subject: [PATCH] And try something else too --- modules/buildd/files/buildd.debian.org.asc | 21 +++++++++++++ modules/buildd/manifests/init.pp | 36 +++++----------------- 2 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 modules/buildd/files/buildd.debian.org.asc diff --git a/modules/buildd/files/buildd.debian.org.asc b/modules/buildd/files/buildd.debian.org.asc new file mode 100644 index 00000000..4858f314 --- /dev/null +++ b/modules/buildd/files/buildd.debian.org.asc @@ -0,0 +1,21 @@ +## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQENBEm1IOQBCAC2D/Q3tcB+/zRx8/O4ry4hvP3JTLB+zCXcyAcIyzPdgmxNXQUZ +IOPSIMluiJfh9Dbgwjxm9oWTkP2LobcfVzIlHA9nVonW42rhhaYJd7yQ8xQ6u15g +7SPNO8b8yinqm+140Sh32PZj/5YGdFf1YpJ82la8PmNFkpLQlP+Kv2hzusun1/fQ +Ui8g81gHq+vO5XTKW06yMk87a4SHeSFEtxjIpivAx9iIpQCF8RmPs7+EbGpG1xpn +pjD8QMzmls8yPFl/0+xh+tvIZoGogIJHDo3I1vDEUuEMqoISnBB+BjWRrcJylQW0 +mbNyiv2AJmNEZLZG3+0KdT9txs7ZKQfsSU6VABEBAAG0J2J1aWxkZC5kZWJpYW4u +b3JnIGFyY2hpdmUga2V5IDIwMDkvMjAxMIkBPAQTAQIAJgUCSbUg5AIbAwUJA8Jn +AAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHxDG3/7kJSE/4gIAJXwWs1IaOVf +qkQpx+ijdyLqoZWpOYeX3Vo9FF2Lk/3+tBol8QFoQoSvrQWg+aP+SXlL1PzpEOvs +87uqRzPvwK7B7eHlzY0mGpshXEGniHNVK4ZBh3svrVN3LwqV6lgHkNWZkBczDfvi +E8du/UXOL7lCADqjZCPRuwGPwkWp32MbZzwRHP0pRyXttRXTDUQXwM6TUhGaHxsB +A4K5AUsooz4PCpIiUwVmle7kGz+NrI+bbyFNJBGnSxwluxGsJayX9kaqbq9JDhsM +i+nhFOCOXomKSbJAaoQZnpGY4fFhk14UdM7EQ9CsEpvBu2CeZu2CibmDR8hPuGMV +duy/LOSZsT0= +=680o +-----END PGP PUBLIC KEY BLOCK----- diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 944b67dd..825f436b 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -10,33 +10,13 @@ class buildd { file { "/etc/apt/sources.list.d/buildd.list": source => "puppet:///files/etc/apt/sources.list.d/buildd.list", - require => Package["apt-transport-https"], - } - -# THIS IS NOT READY YET -# also needs: -# apt key on the system: -# -----BEGIN PGP PUBLIC KEY BLOCK----- -# Version: GnuPG v1.4.9 (GNU/Linux) -# -# mQENBEm1IOQBCAC2D/Q3tcB+/zRx8/O4ry4hvP3JTLB+zCXcyAcIyzPdgmxNXQUZ -# IOPSIMluiJfh9Dbgwjxm9oWTkP2LobcfVzIlHA9nVonW42rhhaYJd7yQ8xQ6u15g -# 7SPNO8b8yinqm+140Sh32PZj/5YGdFf1YpJ82la8PmNFkpLQlP+Kv2hzusun1/fQ -# Ui8g81gHq+vO5XTKW06yMk87a4SHeSFEtxjIpivAx9iIpQCF8RmPs7+EbGpG1xpn -# pjD8QMzmls8yPFl/0+xh+tvIZoGogIJHDo3I1vDEUuEMqoISnBB+BjWRrcJylQW0 -# mbNyiv2AJmNEZLZG3+0KdT9txs7ZKQfsSU6VABEBAAG0J2J1aWxkZC5kZWJpYW4u -# b3JnIGFyY2hpdmUga2V5IDIwMDkvMjAxMIkBPAQTAQIAJgUCSbUg5AIbAwUJA8Jn -# AAYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHxDG3/7kJSE/4gIAJXwWs1IaOVf -# qkQpx+ijdyLqoZWpOYeX3Vo9FF2Lk/3+tBol8QFoQoSvrQWg+aP+SXlL1PzpEOvs -# 87uqRzPvwK7B7eHlzY0mGpshXEGniHNVK4ZBh3svrVN3LwqV6lgHkNWZkBczDfvi -# E8du/UXOL7lCADqjZCPRuwGPwkWp32MbZzwRHP0pRyXttRXTDUQXwM6TUhGaHxsB -# A4K5AUsooz4PCpIiUwVmle7kGz+NrI+bbyFNJBGnSxwluxGsJayX9kaqbq9JDhsM -# i+nhFOCOXomKSbJAaoQZnpGY4fFhk14UdM7EQ9CsEpvBu2CeZu2CibmDR8hPuGMV -# duy/LOSZsT0= -# =680o -# -----END PGP PUBLIC KEY BLOCK----- -# - - + require => Package["apt-transport-https"] + ; + "/etc/apt/trusted-keys.d/buildd.debian.org.asc": + source => "puppet:///buildd/buildd.debian.org.asc", + mode => 664, + notify => Exec["updatekeys"], + ; + } } -- 2.39.2