From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Thu, 3 Apr 2014 17:59:15 +0000 (-0400)
Subject: Merge pull request #281 from daenney/unattended-upgrades-squeeze-origins
X-Git-Tag: 1.5.0~14
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3e5668b0155edd4d7726672fef303fafc89a609b;hp=543f0ccefad1554ba3bf0eab5ad2f67785b1fb8e;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #281 from daenney/unattended-upgrades-squeeze-origins

unattended-upgrades: Fix origins for Squeeze.
---

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