From: Micah Anderson <micah@riseup.net>
Date: Tue, 25 Jun 2013 20:57:07 +0000 (-0400)
Subject: Merge branch 'bug/fix_push' into leap
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8f58a40ad81b32e1abed80485d388753deafb87b;p=puppet-apt.git

Merge branch 'bug/fix_push' into leap

This gets us fixes for the unattended_upgrades in wheezy, as well as the custom_key_dir class parameter replacement of the global variable
Conflicts:
	manifests/unattended_upgrades.pp
---

8f58a40ad81b32e1abed80485d388753deafb87b
diff --cc manifests/unattended_upgrades.pp
index 3492e5f,2f6c2a5..17455fe
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@@ -6,16 -6,17 +6,15 @@@ class apt::unattended_upgrades 
    }
  
    apt_conf { '50unattended-upgrades':
-     source      => [
-                   "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
-                   'puppet:///modules/site_apt/50unattended-upgrades',
-                   "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades",
-                   'puppet:///modules/apt/50unattended-upgrades' ],
-     require     => Package['unattended-upgrades'],
-     refresh_apt => false
+     source  => [
+                 "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+                 "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades",
+                 "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+                 "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ],
+     require => Package['unattended-upgrades'],
    }
  
 -  if $apt::custom_preferences != false {
 -    Apt_conf['50unattended-upgrades'] {
 -      before => File['apt_config'],
 -    }
 +  Apt_conf['50unattended-upgrades'] {
 +    notify => undef
    }
  }