Added support for deploying RPM signing keys from puppet fileserver.
This commit is contained in:
parent
5c8fed20c6
commit
045ce0a3a5
2 changed files with 16 additions and 2 deletions
|
@ -63,6 +63,20 @@ define yum::repo($baseurl="", $mirrorlist="", $descr="", $gpgkey="") {
|
|||
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 {
|
||||
$descr_real = $descr
|
||||
} else {
|
||||
|
|
|
@ -6,9 +6,9 @@ baseurl=<%= baseurl %>
|
|||
<% else -%>
|
||||
mirrorlist=<%= mirrorlist %>
|
||||
<% end -%>
|
||||
<% if gpgkey != '' -%>
|
||||
<% if gpgkey_real != '' -%>
|
||||
gpgcheck=1
|
||||
gpgkey=<%= gpgkey %>
|
||||
gpgkey=<%= gpgkey_real %>
|
||||
<% else -%>
|
||||
gpgcheck=0
|
||||
<% end -%>
|
||||
|
|
Loading…
Add table
Reference in a new issue