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 #375 from raphink/dev/facts_perfs
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
key.pp
diff --git
a/manifests/key.pp
b/manifests/key.pp
index 9ccbfcb6bbf6990a426f8664904a134f407fcc4f..8d3bcf045c58f59df310046853e646b0c538191a 100644
(file)
--- a/
manifests/key.pp
+++ b/
manifests/key.pp
@@
-39,7
+39,8
@@
# [*key_server*]
# _default_: +undef+
#
# [*key_server*]
# _default_: +undef+
#
-# The keyserver from where to fetch our GPG key. It defaults to
+# 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+.
#
# undef which results in apt_key's default keyserver being used,
# currently +keyserver.ubuntu.com+.
#
@@
-68,9
+69,7
@@
define apt::key (
}
if $key_server {
}
if $key_server {
- if !is_domain_name($key_server) {
- fail('$key_server must be a valid domain name')
- }
+ validate_re($key_server,['\A((hkp|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,4})?$'])
}
if $key_options {
}
if $key_options {