From d9a1edcad619b5a87c6f2e9857c8200e540e2410 Mon Sep 17 00:00:00 2001
From: Raoul Bhatia <raoul@bhatia.at>
Date: Fri, 31 Jul 2015 17:35:01 +0200
Subject: Update origins by merging Debian defaults, puppetlabs-apt and own
 research

Default configuration was taken from the following archives
file ./etc/apt/apt.conf.d/50unattended-upgrades

Debian:
* 6 Squeeze: unattended-upgrades_0.62.2+squeeze1_all.deb
* 7 Wheezy:  unattended-upgrades_0.79.5+wheezy2_all.deb
* 8 Jessie:  unattended-upgrades_0.83.3.2+deb8u1_all.deb

Ubuntu:
* 12.04LTS Precise Pangolin: unattended-upgrades_0.76ubuntu1.1_all.deb
* 14.04LTS Trusty Tahr:      unattended-upgrades_0.82.1ubuntu2.3_all.deb
* 15.04 Vivid Vervet:        unattended-upgrades_0.83.6ubuntu1_all.deb
* 15.10 Wily Werewolf:       unattended-upgrades_0.86.2ubuntu1_all.deb
---
 manifests/params.pp | 46 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

(limited to 'manifests')

diff --git a/manifests/params.pp b/manifests/params.pp
index 04ba3ec..4e1b9de 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,3 +1,4 @@
+#
 class unattended_upgrades::params {
 
   if $::osfamily != 'Debian' {
@@ -35,21 +36,48 @@ class unattended_upgrades::params {
     'debian', 'raspbian': {
       case $xfacts['lsbdistcodename'] {
         'squeeze': {
-          $legacy_origin = true
-          $origins       = ['${distro_id} oldstable', #lint:ignore:single_quote_string_with_variables
-                            '${distro_id} ${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
-                            '${distro_id} ${distro_codename}-lts',] #lint:ignore:single_quote_string_with_variables
+          $legacy_origin       = true
+          $origins             = ['${distro_id} oldoldstable', #lint:ignore:single_quote_string_with_variables
+                                  '${distro_id} ${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
+                                  '${distro_id} ${distro_codename}-lts',] #lint:ignore:single_quote_string_with_variables
+        }
+        'wheezy': {
+          $legacy_origin      = false
+          $origins            = ['origin=Debian,archive=stable,label=Debian-Security',
+                                 'origin=Debian,archive=oldstable,label=Debian-Security',]
         }
         default: {
-          $legacy_origin = false
-          $origins       = ['origin=Debian,archive=stable,label=Debian-Security']
+          $legacy_origin      = false
+          $origins            = ['origin=Debian,codename=${distro_codename},label=Debian-Security',] #lint:ignore:single_quote_string_with_variables
         }
       }
     }
     'ubuntu': {
-      $legacy_origin = true
-      $origins       = ['${distro_id} ${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
-                        '${distro_id} ${distro_codename}-updates',] #lint:ignore:single_quote_string_with_variables
+      # TODO do we really want to pull in ${distro_codename}-updates by default?
+      case $distcodename {
+        'precise': {
+          $legacy_origin      = true
+          $origins            = [
+                                 '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
+                                 #'${distro_id}:${distro_codename}-updates', #lint:ignore:single_quote_string_with_variables
+                                ]
+
+        }
+        'trusty', 'utopic', 'vivid', 'wily': {
+          $legacy_origin      = true
+          $origins            = [
+                                 '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
+                                 #'${distro_id}:${distro_codename}-updates', #lint:ignore:single_quote_string_with_variables
+                                ]
+        }
+        default: {
+          $legacy_origin      = true
+          $origins            = [
+                                 '${distro_id}:${distro_codename}-security', #lint:ignore:single_quote_string_with_variables
+                                 #'${distro_id}:${distro_codename}-updates', #lint:ignore:single_quote_string_with_variables
+                                ]
+        }
+      }
     }
     default: {
       fail('Please explicitly specify unattended_upgrades::legacy_origin and unattended_upgrades::origins')
-- 
cgit v1.2.3