From: Scott Barber <scottwbarber@gmail.com>
Date: Thu, 1 Nov 2012 20:33:31 +0000 (-0600)
Subject: Update manifests/init.pp
X-Git-Tag: 1.1.1~6^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=041548bcbe664fc228d11f4b8b54b8f75a1442e0;hp=f985752a1abadf6e5f5440906182ae16fc35d560;p=puppet-modules%2Fpuppetlabs-apt.git

Update manifests/init.pp
---

diff --git a/manifests/init.pp b/manifests/init.pp
index ad1b446..2319771 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -99,18 +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'],
-    }
-  } else {
-    file { 'configure-apt-proxy':
-      path    => "${apt_conf_d}/proxy",
-      ensure  => absent,
-      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.