From: Daniele Sluijters <github@daenney.net>
Date: Wed, 2 Apr 2014 09:17:04 +0000 (+0200)
Subject: unattended-upgrades: Fix origins for Squeeze.
X-Git-Tag: 1.5.0~14^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fefd53036259692fb33e00b89f4ac77ccb96de50;p=puppet-modules%2Fpuppetlabs-apt.git

unattended-upgrades: Fix origins for Squeeze.

Because Squeeze is now oldstable we need to add an oldstable line too
otherwise security updates won't be picked up. This is still because we
can't match on codename.
---

diff --git a/manifests/params.pp b/manifests/params.pp
index 2f6c723..4e974ba 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,7 +11,8 @@ class apt::params {
         'squeeze': {
           $backports_location = 'http://backports.debian.org/debian-backports'
           $legacy_origin       = true
-          $origins             = ['${distro_id} ${distro_codename}-security']
+          $origins             = ['${distro_id} oldstable',
+                                  '${distro_id} ${distro_codename}-security']
         }
         'wheezy': {
           $backports_location = 'http://ftp.debian.org/debian/'
diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb
index 25a1f7a..a2fb48b 100644
--- a/spec/classes/unattended_upgrades_spec.rb
+++ b/spec/classes/unattended_upgrades_spec.rb
@@ -62,6 +62,8 @@ describe 'apt::unattended_upgrades', :type => :class do
             /^Unattended-Upgrade::Allowed-Origins/
           ).with_content(
             /"\${distro_id} \${distro_codename}-security";/
+          ).with_content(
+            /"\${distro_id} oldstable";/
           )
         }
       end