From: intrigeri <intrigeri@boum.org>
Date: Tue, 8 Jan 2013 12:54:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'leap/feature/unattended_upgrades' into review
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=354283d54ea4f03a4ecdb53db2868ec1ced87dbc;p=puppet-apt.git

Merge remote-tracking branch 'leap/feature/unattended_upgrades' into review

Conflicts:
	files/lenny/50unattended-upgrades
---

354283d54ea4f03a4ecdb53db2868ec1ced87dbc
diff --cc manifests/unattended_upgrades.pp
index d2a2352,34d4d31..c538831
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@@ -5,11 -5,11 +5,12 @@@ class apt::unattended_upgrades 
      require => undef,
    }
  
 -  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" ],
 +  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/${::lsbdistcodename}/50unattended-upgrades",
++                'puppet:///modules/apt/50unattended-upgrades' ],
      require => Package['unattended-upgrades'],
    }