]> review.fuel-infra Code Review - puppet-modules/puppetlabs-apt.git/commitdiff
Merge pull request #41 from tbroyer/install-proxy-first
authorNan Liu <nan.liu@gmail.com>
Thu, 3 May 2012 00:31:57 +0000 (17:31 -0700)
committerNan Liu <nan.liu@gmail.com>
Thu, 3 May 2012 00:31:57 +0000 (17:31 -0700)
Make sure we configure the proxy before doing apt-get update.

1  2 
manifests/init.pp

index 3ea92ab1bfa584d0ce0ce83c0e7c5692f7437b7f,ba53fd2a23f2f04fd163b0cc0532b6355c180971..068fb497c4933d3e9d7fb6af925c0a0ab459a581
@@@ -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'],
      }
    }
  }