Merge pull request #209 from pabl0/proxy

Make apt.conf.d/proxy world readable and add a newline
This commit is contained in:
Hunter Haugen 2014-03-05 11:15:26 -08:00
commit a35c30fe4b
2 changed files with 5 additions and 2 deletions

View file

@ -129,8 +129,11 @@ Package: bogus-package\n",
file { 'configure-apt-proxy':
ensure => $proxy_set,
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'],
mode => '0644',
owner => root,
group => root,
}
# Need anchor to provide containment for dependencies.

View file

@ -164,7 +164,7 @@ 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]}\";\n",
'notify' => "Exec[apt_update]"
)
else