X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=ad1b4466d0efea66dcb7af7ab16a1dfc72bd0bd2;hb=f985752a1abadf6e5f5440906182ae16fc35d560;hp=442e04c5875262ec0c3564863527f47341db3d5e;hpb=a3d782c3b5cf128b3ef8e910ef42297a38a96a02;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index 442e04c..ad1b446 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,11 +7,11 @@ # added for use cases related to development environments. # disable_keys - disables the requirement for all packages to be signed # always_apt_update - rather apt should be updated on every run (intended -# for development environments where package updates are frequent +# for development environments where package updates are frequent) # purge_sources_list - Accepts true or false. Defaults to false If set to -# true, Puppet will purge all unmanaged entries from sources.list" +# true, Puppet will purge all unmanaged entries from sources.list # purge_sources_list_d - Accepts true or false. Defaults to false. If set -# to false, Puppet will purge all unmanaged entries from sources.list.d +# to true, Puppet will purge all unmanaged entries from sources.list.d # # Actions: # @@ -105,6 +105,12 @@ class apt( content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";", notify => Exec['apt_update'], } + } else { + file { 'configure-apt-proxy': + path => "${apt_conf_d}/proxy", + ensure => absent, + notify => Exec['apt_update'], + } } # Need anchor to provide containment for dependencies.