String $preferences_d = $apt::params::preferences_d,
String $apt_conf_d = $apt::params::apt_conf_d,
Hash $config_files = $apt::params::config_files,
- Hash $source_key_defaults = $apt::params::source_key_defaults,
Boolean $sources_list_force = $apt::params::sources_list_force,
+
+ Hash $source_key_defaults = {
+ 'server' => $keyserver,
+ 'options' => undef,
+ 'content' => undef,
+ 'source' => undef,
+ }
+
) inherits apt::params {
if $facts['os']['family'] != 'Debian' {
}
$_purge = merge($::apt::purge_defaults, $purge)
- $_proxy = merge($apt::proxy_defaults, $proxy)
+
+ if $proxy['perhost'] {
+ $_perhost = $proxy['perhost'].map |$item| {
+ $_item = merge($apt::proxy_defaults, $item)
+ $_scheme = $_item['https'] ? {
+ true => 'https',
+ default => 'http' }
+ $_port = $_item['port'] ? {
+ Integer => ":${_item['port']}",
+ default => ''
+ }
+ $_target = $_item['direct'] ? {
+ true => 'DIRECT',
+ default => "${_scheme}://${_item['host']}${_port}/" }
+ merge($item, {
+ 'scheme' => $_scheme,
+ 'target' => $_target })
+ }
+ } else {
+ $_perhost = {}
+ }
+
+ $_proxy = merge($apt::proxy_defaults, $proxy, { 'perhost' => $_perhost } )
$confheadertmp = epp('apt/_conf_header.epp')
$proxytmp = epp('apt/proxy.epp', {'proxies' => $_proxy})
default => file,
}
- if $_update['frequency'] == 'always' {
- Exec <| title=='apt_update' |> {
- refreshonly => false,
- }
- }
-
apt::setting { 'conf-update-stamp':
priority => 15,
content => "${confheadertmp}${updatestamptmp}",