Added support for deploying RPM signing keys from puppet fileserver.

This commit is contained in:
Timo Mkinen 2011-03-18 14:13:42 +02:00
parent 5c8fed20c6
commit 045ce0a3a5
2 changed files with 16 additions and 2 deletions

View file

@ -63,6 +63,20 @@ define yum::repo($baseurl="", $mirrorlist="", $descr="", $gpgkey="") {
fail("Cannot set both \$baseurl and \$mirrorlist for yum::repo") fail("Cannot set both \$baseurl and \$mirrorlist for yum::repo")
} }
if regsubst($gpgkey, "^(puppet://).*", '\1') == "puppet://" {
file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-${name}":
ensure => present,
source => $gpgkey,
mode => 0644,
owner => "root",
group => "root",
before => File["/etc/yum.repos.d/${name}.repo"],
}
$gpgkey_real = "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-${name}"
} else {
$gpgkey_real = $gpgkey
}
if $descr { if $descr {
$descr_real = $descr $descr_real = $descr
} else { } else {

View file

@ -6,9 +6,9 @@ baseurl=<%= baseurl %>
<% else -%> <% else -%>
mirrorlist=<%= mirrorlist %> mirrorlist=<%= mirrorlist %>
<% end -%> <% end -%>
<% if gpgkey != '' -%> <% if gpgkey_real != '' -%>
gpgcheck=1 gpgcheck=1
gpgkey=<%= gpgkey %> gpgkey=<%= gpgkey_real %>
<% else -%> <% else -%>
gpgcheck=0 gpgcheck=0
<% end -%> <% end -%>