assert_type(Integer, $update['tries'])
}
- $_update = merge($apt::update_defaults, $update)
+ $_update = $apt::update_defaults + $update
include apt::update
if $purge['sources.list'] {
assert_type(Boolean, $purge['apt.conf.d'])
}
- $_purge = merge($apt::purge_defaults, $purge)
+ $_purge = $apt::purge_defaults + $purge
if $proxy['perhost'] {
$_perhost = $proxy['perhost'].map |$item| {
- $_item = merge($apt::proxy_defaults, $item)
+ $_item = $apt::proxy_defaults + $item
$_scheme = $_item['https'] ? {
true => 'https',
default => 'http',
true => 'DIRECT',
default => "${_scheme}://${_item['host']}${_port}/",
}
- merge($item, {
- 'scheme' => $_scheme,
- 'target' => $_target,
- }
- )
+ $item + { 'scheme' => $_scheme, 'target' => $_target, }
}
} else {
$_perhost = {}
}
- $_proxy = merge($apt::proxy_defaults, $proxy, { 'perhost' => $_perhost })
+ $_proxy = $apt::proxy_defaults + $proxy + { 'perhost' => $_perhost }
$confheadertmp = epp('apt/_conf_header.epp')
$proxytmp = epp('apt/proxy.epp', { 'proxies' => $_proxy })
default => 'present',
}
- $auth_conf_tmp = epp('apt/auth_conf.epp')
+ $auth_conf_tmp = stdlib::deferrable_epp('apt/auth_conf.epp', { 'auth_conf_entries' => $auth_conf_entries })
file { '/etc/apt/auth.conf':
ensure => $auth_conf_ensure,
owner => $auth_conf_owner,
group => 'root',
mode => '0600',
- content => Sensitive("${confheadertmp}${auth_conf_tmp}"),
+ content => Sensitive($auth_conf_tmp),
notify => Class['apt::update'],
}
}
case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
- ensure_packages(['gnupg'])
+ stdlib::ensure_packages(['gnupg'])
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
- ensure_packages(['gnupg'])
+ stdlib::ensure_packages(['gnupg'])
}
}
default: {