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

Update manifests/init.pp

If a proxy is set and then later unset we need to remove the proxy file. As it currently sits it'll just sit there hanging out.
---

diff --git a/manifests/init.pp b/manifests/init.pp
index b8e356c..21f36bd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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.