From d3c45cedc33a875c0c50eb8810a38c114913975d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Mon, 1 Aug 2011 11:47:53 +0300 Subject: [PATCH] Fixed rpm gpg keys from rpmfusion repositories. --- ...on-free-el.key => rpmfusion-free-el-5.key} | 0 ...edora.key => rpmfusion-free-fedora-14.key} | 0 yum/files/keys/rpmfusion-free-fedora-15.key | 27 +++++++++++++++++ ...ra.key => rpmfusion-nonfree-fedora-14.key} | 0 .../keys/rpmfusion-nonfree-fedora-15.key | 30 +++++++++++++++++++ yum/manifests/init.pp | 8 ++--- 6 files changed, 61 insertions(+), 4 deletions(-) rename yum/files/keys/{rpmfusion-free-el.key => rpmfusion-free-el-5.key} (100%) rename yum/files/keys/{rpmfusion-free-fedora.key => rpmfusion-free-fedora-14.key} (100%) create mode 100644 yum/files/keys/rpmfusion-free-fedora-15.key rename yum/files/keys/{rpmfusion-nonfree-fedora.key => rpmfusion-nonfree-fedora-14.key} (100%) create mode 100644 yum/files/keys/rpmfusion-nonfree-fedora-15.key diff --git a/yum/files/keys/rpmfusion-free-el.key b/yum/files/keys/rpmfusion-free-el-5.key similarity index 100% rename from yum/files/keys/rpmfusion-free-el.key rename to yum/files/keys/rpmfusion-free-el-5.key diff --git a/yum/files/keys/rpmfusion-free-fedora.key b/yum/files/keys/rpmfusion-free-fedora-14.key similarity index 100% rename from yum/files/keys/rpmfusion-free-fedora.key rename to yum/files/keys/rpmfusion-free-fedora-14.key diff --git a/yum/files/keys/rpmfusion-free-fedora-15.key b/yum/files/keys/rpmfusion-free-fedora-15.key new file mode 100644 index 0000000..f1cb86d --- /dev/null +++ b/yum/files/keys/rpmfusion-free-fedora-15.key @@ -0,0 +1,27 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.0 + +mQINBEy53XABEAC61c8LShgwzwc6gm28JRCjosQEPsigRI5L2Nu9m6Q0HLL7Gpd+K/AxMepv +21XGOnH4iXOmkTn3eC+KK2iY3Ba5pNVNWMplPQwebMhfW4DT3EuyCiyQEDI1JQyCGsAugZDQ +CXHzv4gvduL71V0N3bM+5Qvsap/5f3fpia7i6uTx9pcivT+xU8LRW/ZjEUcwVo4mNNP53x2n +F+bVyJznq0/KypbdflS9LZUpwyA8mYvoHrMWHkDUYv+aZv/ixJlswHyvbNLKF7yI6Uwgpb5A +5MALEe/ivS+mRV5oVLNm3qIdV3/iihtBW1gZeF3jtb9Q+olM6QpdmfmeMl8/5lyeiQYzswW6 +QoUwZj3uQCC21y2i7+MyyNkoL5wxmgPxu8LPLDBlQzbSXWehBmmczIU0wgIK36p8vF/P7J4F +GsTY3WB9IU4giU6dAAXP/9Q9XJj1fcK9tteDclcLedq4JRGD5gYjGnX2M8v27UyiPIChtQwP +OQdSue5J3jcbIpM6HMfh5EV6MGNo53D2GHPMJ4xXfL45AxjlVLCZ1+fpz+iT0uR7oqPwkMCz +nKaIkq0jK+1AhZf5sp3WKlV4dcXUujatvyFIZhrIatG78T6Z84E4Q9u7KVr+yRFzm9PBjOHo +lsIjUcA9Q3X2bntgyWfgjZ9NXs0V0tqiERP2V42WIzW8KCx9VwARAQABtFNSUE0gRnVzaW9u +IGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxNSkgPHJwbWZ1c2lvbi1idWlsZHN5c0Bs +aXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIAIAUCTLndcAIbAwYLCQgHAwIEFQIIAwQWAgMB +Ah4BAheAAAoJEK3FcN4ApNUr4GwQAKQXQQfhT48Bdgh27qQjU/Wt4Sq9mMi49dkPx8GmpgTO +w/FBD3xlURWC9dUiqlsB8OQA96XOiCUXf7cgkrJsULGnuCXtfiaHACdQTHTrj1bHtlSzB+0N +xX8+lLefGCmgXRcyGq8W4cP0IEOhw8azZ6hLr2Ugl1L22BgesfyXWL820g4dSNSN8bAUku7x +zMzg7Bwd+Rs3OR9Fb4oE/nKINxx2JAW6crF6LE1DFZu0l9BCWlpMJ3Giw+JUqwMdpjet824z +WXacqQOQ4mHBBnQKfb2A5P88H4gQKIqbyxHjo6CQk+8Mn+dHk1dAOyCZSAJJJMHbzwNLNHqL +UUcU0EjV/KX0oKX8IkjStwJiTcE9qMk96C97t/nEZ19eB0OxgVscLwwPr/iTBU6+ll3N2PLd +boXTXEh5U7Ee+UV9ORIhbJ8LXgN0ZgisXGJwjmui1fNcJBFCSKrbfa7VA6K5uldgUMkzIaBc +t9R1YK7lTcJY2WgMo/DoEAktbFJHFLmAihhdB3YHgZn4dGRWaKS0eT6BkQySj1t5qHVUEbSy +eOnTnhxaiPLDM36I+5dkZqckr5loe7SIKM0G6Dsw+8LiUsogC7Ed4L5ZdOuxNH9kAeNHJE8j +KGyy9rj+m1udb2GIAzc0hA65cxQ075CddVYMUBpUdT5PZZebIZsjPA7X5WPjObJ0 +=dU0D +-----END PGP PUBLIC KEY BLOCK----- diff --git a/yum/files/keys/rpmfusion-nonfree-fedora.key b/yum/files/keys/rpmfusion-nonfree-fedora-14.key similarity index 100% rename from yum/files/keys/rpmfusion-nonfree-fedora.key rename to yum/files/keys/rpmfusion-nonfree-fedora-14.key diff --git a/yum/files/keys/rpmfusion-nonfree-fedora-15.key b/yum/files/keys/rpmfusion-nonfree-fedora-15.key new file mode 100644 index 0000000..299326a --- /dev/null +++ b/yum/files/keys/rpmfusion-nonfree-fedora-15.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQINBEy53ewBEADzzR8Z8zpDpHDO/gJuHXjf7GHlNmmEnsQxCFLcPfHurxnIFEJd +1uQ6qE9gAwi1i5ctbPsv22whXwqQbQmKltGZkCd0kcIzVm1Kl5jU8IU+WfRnrEAB +CEjgg9XYkwR9RQGnVqeyZfXLEwlq5pvFNxEgCqDVERlmgPYJYCpV146K1bhCBFxH +NvjKzoDAjr4kNre7cvHAH4n0C2+CTqKlrQrHUY6OhOFdSyt3PEeGAi5xwj6ijGPx +1JTwBxacSTLl1XElPppuf4bSIixRc63q3pa09vGUqIp+qSi3V1BIrVoZhyFMOVVf +PxbIYmvQ6eGWtZyqtOnGty22A3rTHp+QTyseA8DYuksQjsEjQh3q09YBuVOTBrUc +2u0Jwx7PsvOGXkFLZxRrMV0HS71C5YYYzb+KPLgPi+RgvZWMR/IpnrSoWqw68rJo +/JyylfMSLzjYR7fcs5+EgOQ7reXZjOboZ/ipiY+htj80Sg9rQ5Wcc0in+HSl9nQX +0Jp77WzIwtkO26koMkdH5rqjYdvXD3kn0bf6laxqu5D4BinN+e1jCW7g78dxY1fj +PxvmmuyHJ6yuYk7eCFgNcH730KOCy5uu2JHFUe1rAJpTZGRBMpde4L45smlUl2l8 +aH1HcvwziSeqo31ikGqKv3/PIZfzbYyLnuO9gw6mTT0JtrII4pZe/noqMQARAQAB +tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxNSkg +PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIA +IAUCTLnd7AIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEESdBTVtDI7CO8cQ +APIOqUFFhK1OvEM9cA0onvDk/8J6VNNhq1uhb7oivf1ddJW2sSa+oYwG/xHg0jgW +Aru5y1GRgz/YOqcx9lLeRaiVpz3Xr61Xjf0HluR5SU1npxhPjQvZTIFNNrCsOPqa +HDtGMEgLcR4YNIpyCHubjj+5k6oDXupPaiuVj+H06u1v+MpbRuovb2/W1O5DFh0y +plmT0sdNn67pMe04idnZfvLXL+WXTEj+MiJd8Wg1i3HU461h+mmB7TCg2E0EYp6j +PIzAuRzgCIbrJs9wZ6P5rQv94h2yC0hd1LIoNAOwnr+dROFdDaI1509Yx4SbQ35r +7e2fknfflc1j/u+Aq7Q5aiBXYBBulQVmIRValDdlf8BEPv31EIPS1qY9Fi8yWgZs ++71gm/aYFAeBR0YCFinoqDR4IMkRMd4tW+TRiNn7iJpnGLzWvHVtLiCJKJ4YiHJa +k/fQJO6RzsEaeUdRPIgZsfoeMQ84rpnRaDUnG3Km85eu15gPW9fjiLMvtSFYv/Vv +EaoXw4xiqZ5mOu+P4RdTRioCULpiBRgJdx+u0qz0zUnAjz/Vr+iCWy3WI5IdMz9I +gFrQM7fskPlfIUVOgj2x0JOH+Df5PEhEOnVpiyY0c+9jRkYAW3HJWEHVPA9Lyn7W +IA7gZXRKtHxNCUNuyabVq4fUF8YtLzgpzN/IwIBx7Tr0 +=RFor +-----END PGP PUBLIC KEY BLOCK----- diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp index f88a351..e6bf613 100644 --- a/yum/manifests/init.pp +++ b/yum/manifests/init.pp @@ -150,12 +150,12 @@ class yum::repo::rpmfusion-free { yum::repo { "rpmfusion-free": descr => "RPM Fusion for ${flavor} \$releasever - Free", mirrorlist => "http://mirrors.rpmfusion.org/mirrorlist?repo=free-${flavor}-\$releasever&arch=\$basearch", - gpgkey => "puppet:///modules/yum/keys/rpmfusion-free-${flavor}.key", + gpgkey => "puppet:///modules/yum/keys/rpmfusion-free-${flavor}-${lsbmajdistrelease}.key", } yum::repo { "rpmfusion-free-updates": descr => "RPM Fusion for ${flavor} \$releasever - Free", mirrorlist => "http://mirrors.rpmfusion.org/mirrorlist?repo=free-${flavor}-updates-released-\$releasever&arch=\$basearch", - gpgkey => "puppet:///modules/yum/keys/rpmfusion-free-${flavor}.key", + gpgkey => "puppet:///modules/yum/keys/rpmfusion-free-${flavor}-${lsbmajdistrelease}.key", } } @@ -177,12 +177,12 @@ class yum::repo::rpmfusion-nonfree { yum::repo { "rpmfusion-nonfree": descr => "RPM Fusion for ${flavor} \$releasever - Nonfree", mirrorlist => "http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-${flavor}-\$releasever&arch=\$basearch", - gpgkey => "puppet:///modules/yum/keys/rpmfusion-nonfree-${flavor}.key", + gpgkey => "puppet:///modules/yum/keys/rpmfusion-nonfree-${flavor}-${lsbmajdistrelease}.key", } yum::repo { "rpmfusion-nonfree-updates": descr => "RPM Fusion for ${flavor} \$releasever - Nonfree", mirrorlist => "http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-${flavor}-updates-released-\$releasever&arch=\$basearch", - gpgkey => "puppet:///modules/yum/keys/rpmfusion-nonfree-${flavor}.key", + gpgkey => "puppet:///modules/yum/keys/rpmfusion-nonfree-${flavor}-${lsbmajdistrelease}.key", } }