diff --git a/manifests/init.pp b/manifests/init.pp index b8e356c..2319771 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -99,12 +99,16 @@ class apt( default: { fail('Valid values for disable_keys are true or false') } } - if ($proxy_host) { - file { 'configure-apt-proxy': - path => "${apt_conf_d}/proxy", - content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";", - notify => Exec['apt_update'], - } + $proxy_set = $proxy_host ? { + false => absent, + default => present + } + + file { 'configure-apt-proxy': + path => "${apt_conf_d}/proxy", + content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";", + notify => Exec['apt_update'], + ensure => $proxy_set, } # Need anchor to provide containment for dependencies. diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb index d623a5b..a66feac 100644 --- a/spec/classes/apt_spec.rb +++ b/spec/classes/apt_spec.rb @@ -120,7 +120,11 @@ describe 'apt', :type => :class do 'notify' => "Exec[apt_update]" ) else - should_not contain_file('configure_apt_proxy') + should contain_file('configure-apt-proxy').with( + 'path' => '/etc/apt/apt.conf.d/proxy', + 'notify' => 'Exec[apt_update]', + 'ensure' => 'absent' + ) end } end