X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=1c318b67ca979259ef79933b6b0faf2dedb85f7d;hb=a68eca58a658e432fbfffcd91862134082ac7dc0;hp=597774c8338775a56e1e64c1d3a03ffe8ceb59ce;hpb=b764779fa4b1616fb480c3e91df2737ac5b1faab;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/init.pp b/manifests/init.pp index 597774c..1c318b6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -139,19 +139,25 @@ class apt( default: { fail('Valid values for disable_keys are true or false') } } - $proxy_set = $proxy_host ? { - undef => absent, - default => present - } - - file { '01proxy': - ensure => $proxy_set, - path => "${apt_conf_d}/01proxy", - content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n", - notify => Exec['apt_update'], - mode => '0644', - owner => root, - group => root, + case $proxy_host { + false, '', undef: { + file { '01proxy': + ensure => absent, + path => "${apt_conf_d}/01proxy", + notify => Exec['apt_update'], + } + } + default: { + file { '01proxy': + ensure => present, + path => "${apt_conf_d}/01proxy", + content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n", + notify => Exec['apt_update'], + mode => '0644', + owner => root, + group => root, + } + } } file { 'old-proxy-file':