Merge pull request #332 from zacharyalexstern/fix_readme_typo

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

diff --git a/manifests/init.pp b/manifests/init.pp
index 85055c8119101b66b14566201816d749829995cd..597774c8338775a56e1e64c1d3a03ffe8ceb59ce 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -36,7 +36,8 @@ class apt(
   $purge_preferences_d  = false,
   $update_timeout       = undef,
   $update_tries         = undef,
-  $sources              = undef
+  $sources              = undef,
+  $fancy_progress       = undef
 ) {
 
   if $::osfamily != 'Debian' {
@@ -54,13 +55,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 +87,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':
@@ -111,6 +103,24 @@ Package: bogus-package\n",
     recurse => $purge_preferences_d,
   }
 
+  case $fancy_progress {
+    true: {
+      file { '99progressbar':
+        ensure  => present,
+        content => 'Dpkg::Progress-Fancy "1";',
+        path    => "${apt_conf_d}/99progressbar",
+      }
+    }
+    false: {
+      file { '99progressbar':
+        ensure  => absent,
+        path    => "${apt_conf_d}/99progressbar",
+      }
+    }
+    undef: {} # do nothing
+    default: { fail('Valid values for fancy_progress are true or false') }
+  }
+
   case $disable_keys {
     true: {
       file { '99unauth':
@@ -134,9 +144,9 @@ 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',
@@ -144,6 +154,12 @@ Package: bogus-package\n",
     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':
     require => Class['apt::update'],