Merge pull request #376 from raoulbhatia/unattended-upgrades-oldstable

Unattended upgrades oldstable for wheezy

diff --git a/manifests/builddep.pp b/manifests/builddep.pp
index 3beadeb373078533201c6a23825af78dfc3414d3..3a059c273d389751da4359e1d2f38e6c6a9e27de 100644 (file)
--- a/manifests/builddep.pp
+++ b/manifests/builddep.pp
@@ -6,7 +6,7 @@ define apt::builddep() {
   exec { "apt-builddep-${name}":
     command   => "/usr/bin/apt-get -y --force-yes build-dep ${name}",
     logoutput => 'on_failure',
-    require    => Exec['apt_update'],
+    require   => Exec['apt_update'],
   }
 
   # Need anchor to provide containment for dependencies.

diff --git a/manifests/force.pp b/manifests/force.pp
index a73f7ab218ce4a1dc8b691cf73059e06cdacbe77..7524981da251452ec6e125c51afce9b55ef204e2 100644 (file)
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -25,15 +25,15 @@ define apt::force(
   }
 
   case $cfg_files {
-    'new':       { $config_files = '-o Dpkg::Options::="--force-confnew"' }
-    'old':       { $config_files = '-o Dpkg::Options::="--force-confold"' }
-    'unchanged': { $config_files = '-o Dpkg::Options::="--force-confdef"' }
-    'none':      { $config_files = '' }
+    'new':           { $config_files = '-o Dpkg::Options::="--force-confnew"' }
+    'old':           { $config_files = '-o Dpkg::Options::="--force-confold"' }
+    'unchanged':     { $config_files = '-o Dpkg::Options::="--force-confdef"' }
+    'none', default: { $config_files = '' }
   }
 
   case $cfg_missing {
-    true:    { $config_missing = '-o Dpkg::Options::="--force-confmiss"' }
-    false:   { $config_missing = '' }
+    true:           { $config_missing = '-o Dpkg::Options::="--force-confmiss"' }
+    false, default: { $config_missing = '' }
   }
 
   if $version == false {

diff --git a/manifests/params.pp b/manifests/params.pp
index d33a401fe6df214ff93c85bccb83635ed7e27e1b..06925a341b34ede9084d6fd48c2093ffdba3e045 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -45,7 +45,8 @@ class apt::params {
         'wheezy': {
           $backports_location = 'http://ftp.debian.org/debian/'
           $legacy_origin      = false
-          $origins            = ['origin=Debian,archive=stable,label=Debian-Security']
+          $origins            = ['origin=Debian,archive=stable,label=Debian-Security',
+                                  'origin=Debian,archive=oldstable,label=Debian-Security']
         }
         default: {
           $backports_location = 'http://http.debian.net/debian/'

diff --git a/spec/classes/unattended_upgrades_spec.rb b/spec/classes/unattended_upgrades_spec.rb
index 57df21cbdfa3a2750ab38d167cf20393fd919d08..3742bf1c2add1dd9206ae849d4b6a797210b91ed 100644 (file)
--- a/spec/classes/unattended_upgrades_spec.rb
+++ b/spec/classes/unattended_upgrades_spec.rb
@@ -134,6 +134,17 @@ describe 'apt::unattended_upgrades', :type => :class do
     it { is_expected.to_not contain_file("/etc/apt/apt.conf.d/10periodic").with_content %r{APT::Periodic::RandomSleep}}
   end
 
+  context 'wheezy' do
+    let :facts do
+      {
+        'lsbdistid'       => 'debian',
+        'lsbdistcodename' => 'wheezy',
+      }
+    end
+
+    it { is_expected.to contain_file("/etc/apt/apt.conf.d/50unattended-upgrades").with_content %r{Unattended-Upgrade::Origins-Pattern \{\n\t"origin=Debian,archive=stable,label=Debian-Security";\n\t"origin=Debian,archive=oldstable,label=Debian-Security";\n\};} }
+  end
+
   context 'anything but defaults' do
     let :facts do
       {