X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=a55d584a1324469fec3d33ac6cc6619262f98f3d;hb=d3d6fde6e7aee520c8b659a641fdf50dcd5e20f4;hp=e4e43b178785b05207597cd8ebb8823480265896;hpb=a35c30fe4b501e1bce24fe120cc8cd348b914ac6;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index e4e43b1..a55d584 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -14,6 +14,9 @@
 #     to true, Puppet will purge all unmanaged entries from sources.list.d
 #   update_timeout - Overrides the exec timeout in seconds for apt-get update.
 #     If not set defaults to Exec's default (300)
+#   update_tries - Number of times that `apt-get update` will be tried. Use this
+#     to work around transient DNS and HTTP errors. By default, the command
+#     will only be run once.
 #
 # Actions:
 #
@@ -32,9 +35,14 @@ class apt(
   $purge_preferences    = false,
   $purge_preferences_d  = false,
   $update_timeout       = undef,
+  $update_tries         = undef,
   $sources              = undef
 ) {
 
+  if $::osfamily != 'Debian' {
+    fail('This module only works on Debian or derivatives like Ubuntu')
+  }
+
   include apt::params
   include apt::update
 
@@ -46,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 {
@@ -126,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':
@@ -143,7 +162,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)
   }
 }