X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=aa61986d21fdc992b3b3cecf85c898f6ea35a7f1;hb=ecb9bfe4edcb4c285c8c86e39ff047641b814b8e;hp=40a40aff07650e457eabd3d56d1960f33176607a;hpb=03681047ed16a1f88d63fe1cd07ea85815257b6f;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index 40a40af..aa61986 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,98 +3,87 @@ # Manage APT (Advanced Packaging Tool) # class apt ( - Variant[Hash, Stdlib::Compat::Hash] $update_defaults, - Variant[Hash, Stdlib::Compat::Hash] $purge_defaults, - Variant[Hash, Stdlib::Compat::Hash] $proxy_defaults, - Variant[Hash, Stdlib::Compat::Hash] $include_defaults, - Variant[String, Stdlib::Compat::String] $provider, - Variant[String, Stdlib::Compat::String] $keyserver, - Optional[Variant[String, Stdlib::Compat::String]] $ppa_options, - Optional[Variant[String, Stdlib::Compat::String]] $ppa_package, - Optional[Variant[Hash, Stdlib::Compat::Hash]] $backports, - Variant[Hash, Stdlib::Compat::Hash] $confs = {}, - Variant[Hash, Stdlib::Compat::Hash] $update = {}, - Variant[Hash, Stdlib::Compat::Hash] $purge = {}, - Variant[Hash, Stdlib::Compat::Hash] $proxy = {}, - Variant[Hash, Stdlib::Compat::Hash] $sources = {}, - Variant[Hash, Stdlib::Compat::Hash] $keys = {}, - Variant[Hash, Stdlib::Compat::Hash] $ppas = {}, - Variant[Hash, Stdlib::Compat::Hash] $pins = {}, - Variant[Hash, Stdlib::Compat::Hash] $settings = {}, - Variant[String, Stdlib::Compat::String] $root = '/etc/apt', - Variant[String, Stdlib::Compat::String] $sources_list = "${root}/sources.list", - Variant[String, Stdlib::Compat::String] $sources_list_d = "${root}/sources.list.d", - Variant[String, Stdlib::Compat::String] $conf_d = "${root}/apt.conf.d", - Variant[String, Stdlib::Compat::String] $preferences = "${root}/preferences", - Variant[String, Stdlib::Compat::String] $preferences_d = "${root}/preferences.d", - Variant[Hash, Stdlib::Compat::Hash] $config_files = { conf => { path => $conf_d, ext => '' }, pref => { path => $preferences_d, ext => '.pref' }, list => { path => $sources_list_d, ext => '.list' } }, - Variant[Hash, Stdlib::Compat::Hash] $source_key_defaults = { 'server' => $keyserver, 'options' => undef, 'content' => undef, 'source' => undef }, -) { + Hash $update_defaults = $apt::params::update_defaults, + Hash $purge_defaults = $apt::params::purge_defaults, + Hash $proxy_defaults = $apt::params::proxy_defaults, + Hash $include_defaults = $apt::params::include_defaults, + String $provider = $apt::params::provider, + String $keyserver = $apt::params::keyserver, + Optional[String] $ppa_options = $apt::params::ppa_options, + Optional[String] $ppa_package = $apt::params::ppa_package, + Optional[Hash] $backports = $apt::params::backports, + Hash $confs = $apt::params::confs, + Hash $update = $apt::params::update, + Hash $purge = $apt::params::purge, + Hash $proxy = $apt::params::proxy, + Hash $sources = $apt::params::sources, + Hash $keys = $apt::params::keys, + Hash $ppas = $apt::params::ppas, + Hash $pins = $apt::params::pins, + Hash $settings = $apt::params::settings, + String $root = $apt::params::root, + String $sources_list = $apt::params::sources_list, + String $sources_list_d = $apt::params::sources_list_d, + String $conf_d = $apt::params::conf_d, + String $preferences = $apt::params::preferences, + String $preferences_d = $apt::params::preferences_d, + Hash $config_files = $apt::params::config_files, + Hash $source_key_defaults = $apt::params::source_key_defaults +) inherits apt::params { if $facts['osfamily'] != 'Debian' { fail('This module only works on Debian or derivatives like Ubuntu') } - $frequency_options = ['always','daily','weekly','reluctantly'] - validate_legacy(Hash, 'validate_hash', $update) if $update['frequency'] { - validate_re($update['frequency'], $frequency_options) + assert_type( + Enum['always','daily','weekly','reluctantly'], + $update['frequency'], + ) } if $update['timeout'] { - unless is_integer($update['timeout']) { - fail('timeout value for update must be an integer') - } + assert_type(Integer, $update['timeout']) } if $update['tries'] { - unless is_integer($update['tries']) { - fail('tries value for update must be an integer') - } + assert_type(Integer, $update['tries']) } $_update = merge($::apt::update_defaults, $update) include ::apt::update - validate_legacy(Hash, 'validate_hash', $purge) if $purge['sources.list'] { - validate_legacy(Boolean, 'validate_bool', $purge['sources.list']) + assert_type(Boolean, $purge['sources.list']) } if $purge['sources.list.d'] { - validate_legacy(Boolean, 'validate_bool', $purge['sources.list.d']) + assert_type(Boolean, $purge['sources.list.d']) } if $purge['preferences'] { - validate_legacy(Boolean, 'validate_bool', $purge['preferences']) + assert_type(Boolean, $purge['preferences']) } if $purge['preferences.d'] { - validate_legacy(Boolean, 'validate_bool', $purge['preferences.d']) + assert_type(Boolean, $purge['preferences.d']) } $_purge = merge($::apt::purge_defaults, $purge) - validate_hash($proxy) if $proxy['ensure'] { - validate_re($proxy['ensure'], ['file', 'present', 'absent']) + assert_type(Enum['file', 'present', 'absent'], $proxy['ensure']) } if $proxy['host'] { - validate_legacy(String, 'validate_string', $proxy['host']) + assert_type(String, $proxy['host']) } if $proxy['port'] { - unless is_integer($proxy['port']) { - fail('$proxy port must be an integer') - } + assert_type(Integer, $proxy['port']) } - if $proxy['https'] { - validate_legacy(Boolean, 'validate_bool', $proxy['https']) + if $proxy['https']{ + assert_type(Boolean, $proxy['https']) + } + if $proxy['direct']{ + assert_type(Boolean, $proxy['direct']) } $_proxy = merge($apt::proxy_defaults, $proxy) - validate_legacy(Hash, 'validate_hash', $confs) - validate_legacy(Hash, 'validate_hash', $sources) - validate_legacy(Hash, 'validate_hash', $keys) - validate_legacy(Hash, 'validate_hash', $settings) - validate_legacy(Hash, 'validate_hash', $ppas) - validate_legacy(Hash, 'validate_hash', $pins) - $confheadertmp = epp('apt/_conf_header.epp') $proxytmp = epp('apt/proxy.epp', {'proxies' => $_proxy}) $updatestamptmp = epp('apt/15update-stamp.epp') @@ -193,4 +182,19 @@ class apt ( if $pins { create_resources('apt::pin', $pins) } + + # required for adding GPG keys on Debian 9 (and derivatives) + case $facts['os']['name'] { + 'Debian': { + if versioncmp($facts['os']['release']['major'], '9') >= 0 { + ensure_packages(['dirmngr']) + } + } + 'Ubuntu': { + if versioncmp($facts['os']['release']['full'], '17.04') >= 0 { + ensure_packages(['dirmngr']) + } + } + default: { } + } }