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

Make apt.conf.d/proxy world readable and add a newline

Browse source
This commit is contained in:
Henrik Ahlgren 2014-01-10 17:09:18 +02:00
parent 1853951c0f
commit eb40a7ae78
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manifests/init.pp
View file

@ -128,8 +128,11 @@ Package: bogus-package\n",
file { 'configure-apt-proxy': file { 'configure-apt-proxy':
ensure => $proxy_set, ensure => $proxy_set,
path => "${apt_conf_d}/proxy", path => "${apt_conf_d}/proxy",
content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";", content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
notify => Exec['apt_update'], notify => Exec['apt_update'],
mode => '0644',
owner => root,
group => root,
} }
# Need anchor to provide containment for dependencies. # Need anchor to provide containment for dependencies.

2
spec/classes/apt_spec.rb
View file

@ -164,7 +164,7 @@ describe 'apt', :type => :class do
if param_hash[:proxy_host] if param_hash[:proxy_host]
should contain_file('configure-apt-proxy').with( should contain_file('configure-apt-proxy').with(
'path' => '/etc/apt/apt.conf.d/proxy', '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]}\";\n",
'notify' => "Exec[apt_update]" 'notify' => "Exec[apt_update]"
) )
else else