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 2f6c7238c20d9535e57bb85c5aab6e098b669b80..4e974ba48b894efea81590aa94b1b2432f1600c9 100644 (file)
--- 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 25a1f7aed33fbdbaddf0250d0777293a1e1c5434..a2fb48b12600e5bc0e3fbc6a43a5e22fa1c8c8d1 100644 (file)
--- 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