From: Nan Liu <nan.liu@gmail.com>
Date: Thu, 3 May 2012 00:31:57 +0000 (-0700)
Subject: Merge pull request #41 from tbroyer/install-proxy-first
X-Git-Tag: 0.0.3~8
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=51a7596b03fb0fb18a2dfaf54b011484b94f6308;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #41 from tbroyer/install-proxy-first

Make sure we configure the proxy before doing apt-get update.
---

51a7596b03fb0fb18a2dfaf54b011484b94f6308
diff --cc manifests/init.pp
index 3ea92ab,ba53fd2..068fb49
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -93,10 -87,11 +93,11 @@@ class apt
      default: { fail('Valid values for disable_keys are true or false') }
    }
  
-   if($proxy_host) {
+   if ($proxy_host) {
      file { 'configure-apt-proxy':
 -      path    => '/etc/apt/apt.conf.d/proxy',
 +      path    => "${apt_conf_d}/proxy",
        content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
+       notify  => Exec['apt_update'],
      }
    }
  }