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
Remove update bundler
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 44e66ce51ff2dd00980603ae05423c11d092cae3..aa61986d21fdc992b3b3cecf85c898f6ea35a7f1 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-35,10
+35,11
@@
class apt (
fail('This module only works on Debian or derivatives like Ubuntu')
}
fail('This module only works on Debian or derivatives like Ubuntu')
}
- $frequency_options = ['always','daily','weekly','reluctantly']
-
if $update['frequency'] {
if $update['frequency'] {
- validate_re($update['frequency'], $frequency_options)
+ assert_type(
+ Enum['always','daily','weekly','reluctantly'],
+ $update['frequency'],
+ )
}
if $update['timeout'] {
assert_type(Integer, $update['timeout'])
}
if $update['timeout'] {
assert_type(Integer, $update['timeout'])
@@
-66,7
+67,7
@@
class apt (
$_purge = merge($::apt::purge_defaults, $purge)
if $proxy['ensure'] {
$_purge = merge($::apt::purge_defaults, $purge)
if $proxy['ensure'] {
-
validate_re($proxy['ensure'], ['file', 'present', 'absent
'])
+
assert_type(Enum['file', 'present', 'absent'], $proxy['ensure
'])
}
if $proxy['host'] {
assert_type(String, $proxy['host'])
}
if $proxy['host'] {
assert_type(String, $proxy['host'])
@@
-77,6
+78,9
@@
class apt (
if $proxy['https']{
assert_type(Boolean, $proxy['https'])
}
if $proxy['https']{
assert_type(Boolean, $proxy['https'])
}
+ if $proxy['direct']{
+ assert_type(Boolean, $proxy['direct'])
+ }
$_proxy = merge($apt::proxy_defaults, $proxy)
$_proxy = merge($apt::proxy_defaults, $proxy)
@@
-182,7
+186,7
@@
class apt (
# required for adding GPG keys on Debian 9 (and derivatives)
case $facts['os']['name'] {
'Debian': {
# required for adding GPG keys on Debian 9 (and derivatives)
case $facts['os']['name'] {
'Debian': {
- if versioncmp($facts['os']['release']['
full'], '9.0
') >= 0 {
+ if versioncmp($facts['os']['release']['
major'], '9
') >= 0 {
ensure_packages(['dirmngr'])
}
}
ensure_packages(['dirmngr'])
}
}