X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=c42d9ac049ae328076ae5ef183d5fdf5826d5a49;hb=f0d18b6ed78b6177e8a7bab721d340d811b10b9c;hp=e41cd3fdee7514b6373603d917638e3a77dbd28e;hpb=0ffe484c7c5d64295f32eb34ce47c60eb823c66c;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index e41cd3f..c42d9ac 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -20,18 +20,19 @@ # Sample Usage: # class { 'apt': } class apt( - $always_apt_update = false, - $disable_keys = undef, - $proxy_host = false, - $proxy_port = '8080', - $purge_sources_list = false, - $purge_sources_list_d = false + $always_apt_update = false, + $disable_keys = undef, + $proxy_host = false, + $proxy_port = '8080', + $purge_sources_list = false, + $purge_sources_list_d = false, + $purge_preferences_d = false ) { include apt::params include apt::update - validate_bool($purge_sources_list, $purge_sources_list_d) + validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d) $sources_list_content = $purge_sources_list ? { false => undef, @@ -47,6 +48,7 @@ class apt( $root = $apt::params::root $apt_conf_d = $apt::params::apt_conf_d $sources_list_d = $apt::params::sources_list_d + $preferences_d = $apt::params::preferences_d $provider = $apt::params::provider file { 'sources.list': @@ -69,6 +71,15 @@ class apt( notify => Exec['apt_update'], } + file { 'preferences.d': + ensure => directory, + path => $preferences_d, + owner => root, + group => root, + purge => $purge_preferences_d, + recurse => $purge_preferences_d, + } + case $disable_keys { true: { file { '99unauth': @@ -94,4 +105,9 @@ class apt( notify => Exec['apt_update'], } } + + # Need anchor to provide containment for dependencies. + anchor { "apt::update": + require => Class['apt::update'], + } }