Merge branch '1.4.x' into 14x-merge

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

diff --git a/manifests/init.pp b/manifests/init.pp
index 517391535a931cf1ee6c3c39f03f8020341e6c3c..48b62d178a30056b83d4edbde6598397bfad4497 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,13 +54,6 @@ class apt(
     true  => "# Repos managed by puppet.\n",
   }
 
-  $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 {
     Exec <| title=='apt_update' |> {
       refreshonly => false,
@@ -93,13 +86,11 @@ Package: bogus-package\n",
     notify  => Exec['apt_update'],
   }
 
-  file { 'apt-preferences':
-    ensure  => present,
-    path    => "${root}/preferences",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => $preferences_content,
+  if $purge_preferences {
+    file { 'apt-preferences':
+      ensure  => absent,
+      path    => "${root}/preferences",
+    }
   }
 
   file { 'preferences.d':
@@ -134,15 +125,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':
@@ -151,7 +148,7 @@ Package: bogus-package\n",
 
   # manage sources if present
   if $sources != undef {
-   validate_hash($sources)
-   create_resources('apt::source', $sources)
+    validate_hash($sources)
+    create_resources('apt::source', $sources)
   }
 }