X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=fdfd600781b9fb2cfbbedf10ff2a6de1451499b5;hb=refs%2Ftags%2Fv8.2.0;hp=fcfb09c30de2ba94bdb25498747856aab2920210;hpb=8038d0a43280307c67cff5c610cb6c023683a10a;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index fcfb09c..fdfd600 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -153,12 +153,19 @@ class apt ( 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['osfamily'] != 'Debian' { - fail(translate('This module only works on Debian or derivatives like Ubuntu')) + if $facts['os']['family'] != 'Debian' { + fail('This module only works on Debian or derivatives like Ubuntu') } if $update['frequency'] { @@ -329,7 +336,7 @@ class apt ( owner => $auth_conf_owner, group => 'root', mode => '0600', - content => "${confheadertmp}${auth_conf_tmp}", + content => Sensitive("${confheadertmp}${auth_conf_tmp}"), notify => Class['apt::update'], } }