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
install apt-transport-https on Debian 7 as well
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 319e0649cd74fc0695f13afc8119804f289db7fb..aa61986d21fdc992b3b3cecf85c898f6ea35a7f1 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-78,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)
@@
-183,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'])
}
}