opuppet/module-puppetlabs-apt
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Make sure we configure the proxy before doing apt-get update.
This commit is contained in:
Nan Liu 2012-05-02 17:31:57 -07:00
commit 51a7596b03
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
manifests/init.pp
View file

@ -93,10 +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 => "${apt_conf_d}/proxy",
content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
notify => Exec['apt_update'],
}
}
}

3
spec/classes/apt_spec.rb
View file

@ -117,7 +117,8 @@ describe 'apt', :type => :class do
if param_hash[:proxy_host]
should contain_file('configure-apt-proxy').with(
'path' => '/etc/apt/apt.conf.d/proxy',
'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";"
'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";",
'notify' => "Exec[apt_update]"
)
else
should_not contain_file('configure_apt_proxy')