X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=06dc0acf458e07155db933198999552340489467;hb=bbec706b5da9d9e2ea0bedbc73be8d38f31d4cd8;hp=453df3171f3e0191cf4ff9018229a6297f85582e;hpb=df47ca7ff4966bdc2725eb85be675f5e0ae798b5;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index 453df31..06dc0ac 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,84 +1,111 @@ +# == Class: apt # -class apt( - $update = {}, - $purge = {}, - $proxy = {}, - $sources = {}, - $keys = {}, - $ppas = {}, - $settings = {}, -) inherits ::apt::params { - - $frequency_options = ['always','daily','weekly','reluctantly'] - validate_hash($update) +# Manage APT (Advanced Packaging Tool) +# +class apt ( + 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, + Array[Apt::Auth_conf_entry] + $auth_conf_entries = $apt::params::auth_conf_entries, + 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') + } + 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 + include ::apt::update - validate_hash($purge) if $purge['sources.list'] { - validate_bool($purge['sources.list']) + assert_type(Boolean, $purge['sources.list']) } if $purge['sources.list.d'] { - validate_bool($purge['sources.list.d']) + assert_type(Boolean, $purge['sources.list.d']) } if $purge['preferences'] { - validate_bool($purge['preferences']) + assert_type(Boolean, $purge['preferences']) } if $purge['preferences.d'] { - validate_bool($purge['preferences.d']) + assert_type(Boolean, $purge['preferences.d']) } $_purge = merge($::apt::purge_defaults, $purge) - validate_hash($proxy) + if $proxy['ensure'] { + assert_type(Enum['file', 'present', 'absent'], $proxy['ensure']) + } if $proxy['host'] { - 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_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_hash($sources) - validate_hash($keys) - validate_hash($settings) - validate_hash($ppas) + $confheadertmp = epp('apt/_conf_header.epp') + $proxytmp = epp('apt/proxy.epp', {'proxies' => $_proxy}) + $updatestamptmp = epp('apt/15update-stamp.epp') - if $proxy['host'] { + if $_proxy['ensure'] == 'absent' or $_proxy['host'] { apt::setting { 'conf-proxy': + ensure => $_proxy['ensure'], priority => '01', - content => template('apt/_header.erb', 'apt/proxy.erb'), + content => "${confheadertmp}${proxytmp}", } } $sources_list_content = $_purge['sources.list'] ? { - false => undef, - true => "# Repos managed by puppet.\n", + true => "# Repos managed by puppet.\n", + default => undef, } $preferences_ensure = $_purge['preferences'] ? { - false => file, - true => absent, + true => absent, + default => file, } if $_update['frequency'] == 'always' { @@ -89,7 +116,7 @@ class apt( apt::setting { 'conf-update-stamp': priority => 15, - content => template('apt/_header.erb', 'apt/15update-stamp.erb'), + content => "${confheadertmp}${updatestamptmp}", } file { 'sources.list': @@ -99,7 +126,7 @@ class apt( group => root, mode => '0644', content => $sources_list_content, - notify => Exec['apt_update'], + notify => Class['apt::update'], } file { 'sources.list.d': @@ -110,7 +137,7 @@ class apt( mode => '0644', purge => $_purge['sources.list.d'], recurse => $_purge['sources.list.d'], - notify => Exec['apt_update'], + notify => Class['apt::update'], } file { 'preferences': @@ -119,7 +146,7 @@ class apt( owner => root, group => root, mode => '0644', - notify => Exec['apt_update'], + notify => Class['apt::update'], } file { 'preferences.d': @@ -130,14 +157,12 @@ class apt( mode => '0644', purge => $_purge['preferences.d'], recurse => $_purge['preferences.d'], - notify => Exec['apt_update'], + notify => Class['apt::update'], } - # Need anchor to provide containment for dependencies. - anchor { 'apt::update': - require => Class['apt::update'], + if $confs { + create_resources('apt::conf', $confs) } - # manage sources if present if $sources { create_resources('apt::source', $sources) @@ -154,4 +179,28 @@ class apt( if $settings { create_resources('apt::setting', $settings) } + + $auth_conf_ensure = $auth_conf_entries ? { + [] => 'absent', + default => 'present', + } + + $auth_conf_tmp = epp('apt/auth_conf.epp') + + file { '/etc/apt/auth.conf': + ensure => $auth_conf_ensure, + owner => 'root', + group => 'root', + mode => '0600', + content => "${confheadertmp}${auth_conf_tmp}", + notify => Class['apt::update'], + } + + # manage pins if present + if $pins { + create_resources('apt::pin', $pins) + } + + # required for adding GPG keys on Debian 9 (and derivatives) + ensure_packages(['dirmngr']) }