Do not add bogus line to apt preference file on Debian Wheezy

[puppet-modules/puppetlabs-apt.git] / manifests / init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 85055c8119101b66b14566201816d749829995cd..a55d584a1324469fec3d33ac6cc6619262f98f3d 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,11 +54,16 @@ class apt(
     true  => "# Repos managed by puppet.\n",
   }
 
-  $preferences_content = $purge_preferences ? {
-    false => undef,
-    true  => "Explanation: Preferences managed by Puppet\n
+  if $lsbdistcodename == 'wheezy' {
+    $preferences_content = undef
+  } 
+  else {
+    $preferences_content = $purge_preferences ? {
+      false => undef,
+      true => "Explanation: Preferences managed by Puppet\n
 Explanation: We need a bogus package line because of Debian Bug #732746\n
 Package: bogus-package\n",
+    }
   }
 
   if $always_apt_update == true {
@@ -134,15 +139,21 @@ Package: bogus-package\n",
     default => present
   }
 
-  file { 'configure-apt-proxy':
+  file { '01proxy':
     ensure  => $proxy_set,
-    path    => "${apt_conf_d}/proxy",
+    path    => "${apt_conf_d}/01proxy",
     content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
     notify  => Exec['apt_update'],
     mode    => '0644',
     owner   => root,
     group   => root,
   }
+  
+  file { 'old-proxy-file':
+    ensure  => absent,
+    path    => "${apt_conf_d}/proxy",
+    notify  => Exec['apt_update'],
+  }
 
   # Need anchor to provide containment for dependencies.
   anchor { 'apt::update':