Merge pull request #209 from pabl0/proxy

Make apt.conf.d/proxy world readable and add a newline
puppetlabs · Mar 5, 2014 · a35c30f · a35c30f
2 parents de095a1 + eb40a7a
commit a35c30f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -129,8 +129,11 @@
   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.

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
@@ -164,7 +164,7 @@
           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