Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #502 from mhaskel/merge_2.0.x_to_master
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
key.pp
diff --git
a/manifests/key.pp
b/manifests/key.pp
index 05bda975b097a99b9b70659d292ed4d6f750d64e..6761e6912d31a253fd969c0dd4c5a48d8679e964 100644
(file)
--- a/
manifests/key.pp
+++ b/
manifests/key.pp
@@
-42,9
+42,7
@@
# _default_: +undef+
#
# The keyserver from where to fetch our GPG key. It can either be a domain
# _default_: +undef+
#
# The keyserver from where to fetch our GPG key. It can either be a domain
-# name or url. It defaults to
-# undef which results in apt_key's default keyserver being used,
-# currently +keyserver.ubuntu.com+.
+# name or url. It defaults to +keyserver.ubuntu.com+.
#
# [*options*]
# _default_: +undef+
#
# [*options*]
# _default_: +undef+
@@
-55,7
+53,7
@@
define apt::key (
$ensure = present,
$content = undef,
$source = undef,
$ensure = present,
$content = undef,
$source = undef,
- $server =
undef
,
+ $server =
$::apt::keyserver
,
$options = undef,
) {
$options = undef,
) {