From 88bfe5fbab79b23a3f1d19c6283bdb2efd28598e Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 20 Jun 2013 15:32:51 -0400
Subject: fix for the following: warning: Dynamic lookup of $custom_preferences
 at modules/apt/manifests/preferences_snippet.pp:16 is deprecated. For more
 information, see http://docs.puppetlabs.com/guides/scope_and_puppet.html. To
 see the change in behavior, use the --debug flag.

---
 manifests/preferences_snippet.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 5ae748b..cbc83d2 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -13,7 +13,7 @@ define apt::preferences_snippet (
   }
 
   if $ensure == 'present' {
-    if $custom_preferences == false {
+    if $apt::custom_preferences == false {
       fail('Trying to define a preferences_snippet with $custom_preferences set to false.')
     }
 
-- 
cgit v1.2.3


From f11e3d475345059220402a44a97da491c85d2b5a Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 25 Jun 2013 11:31:22 -0400
Subject: remove unnecessary before dependency on the /etc/apt/preferences file
 in unattended_upgrades.pp

---
 manifests/unattended_upgrades.pp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index b9d19c3..3492e5f 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -18,10 +18,4 @@ class apt::unattended_upgrades {
   Apt_conf['50unattended-upgrades'] {
     notify => undef
   }
-
-  if $apt::custom_preferences != false {
-    Apt_conf['50unattended-upgrades'] {
-      before => File['apt_config'],
-    }
-  }
 }
-- 
cgit v1.2.3


From 50b4bef76180181a34d04958b320295c7b6e9cf0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 26 Jan 2013 15:20:30 -0200
Subject: Make custom_key_dir a class parameter and not a global variable

Conflicts:
	manifests/init.pp
---
 README              | 22 ++++++++++------------
 manifests/init.pp   |  7 ++++---
 manifests/params.pp |  1 +
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README b/README
index f241a19..35a88b2 100644
--- a/README
+++ b/README
@@ -129,18 +129,6 @@ pull in the templates/site_apt/sources.list file:
 
   $custom_sources_list = template('site_apt/sources.list')
 
-$custom_key_dir
----------------
-
-If you have different apt-key files that you want to get added to your
-apt keyring, you can set this variable to a path in your fileserver
-where individual key files can be placed. If this is set and keys
-exist there, this module will 'apt-key add' each key.
-
-The debian-archive-keyring package is installed and kept current up to the
-latest revision (this includes the backports archive keyring).
-
-
 Classes
 =======
 
@@ -235,6 +223,16 @@ Class parameters:
      include apt::dist_upgrade
      class { 'apt': codename => 'wheezy', notify => Exec['apt_dist-upgrade'] }
 
+* custom_key_dir
+
+  If you have different apt-key files that you want to get added to your
+  apt keyring, you can set this variable to a path in your fileserver
+  where individual key files can be placed. If this is set and keys
+  exist there, this module will 'apt-key add' each key.
+
+  The debian-archive-keyring package is installed and kept current up to the
+  latest revision (this includes the backports archive keyring).
+
 apt::apticron
 -------------
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 3f8e1c8..de28c23 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,7 +15,8 @@ class apt(
   $ubuntu_url = $apt::params::ubuntu_url,
   $repos = $apt::params::repos,
   $custom_preferences = $apt::params::custom_preferences,
-  $disable_update = $apt::params::disable_update
+  $disable_update = $apt::params::disable_update,
+  $custom_key_dir = $apt::params::custom_key_dir
 ) inherits apt::params {
   case $::operatingsystem {
     'debian': {
@@ -113,9 +114,9 @@ class apt(
   $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
   modules_dir { 'apt': }
 
-  if $::custom_key_dir {
+  if $custom_key_dir {
     file { "${apt_base_dir}/keys.d":
-      source  => $::custom_key_dir,
+      source  => $custom_key_dir,
       recurse => true,
       owner   => root,
       group   => root,
diff --git a/manifests/params.pp b/manifests/params.pp
index b210ff6..12273ac 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -14,4 +14,5 @@ class apt::params () {
   $repos = 'auto'
   $custom_preferences = ''
   $disable_update = false
+  $custom_key_dir = false
 }
-- 
cgit v1.2.3


From 92406aa9180b15b35a3c102fac0e70d4e620a6e1 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 14 Apr 2013 13:44:42 +0200
Subject: fix default unattended-upgrades config file

---
 files/50unattended-upgrades | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/files/50unattended-upgrades b/files/50unattended-upgrades
index ebf9f49..329c95c 100644
--- a/files/50unattended-upgrades
+++ b/files/50unattended-upgrades
@@ -2,14 +2,14 @@
 
 Unattended-Upgrade::Origins-Pattern {
   // Debian
-  "o=${distro_id},n=${distro_codename}";
-  "o=${distro_id},n=${distro_codename}-updates";
-  "o=${distro_id},n=${distro_codename},l=Debian-security";
-  "o=${distro_id} Backports,n=${distro_codename}-backports";  
+  "${distro_id} ${distro_codename}";
+  "${distro_id} ${distro_codename}-updates";
+  "${distro_id} ${distro_codename}-security";
+  "${distro_id} Backports:${distro_codename}-backports"; 
   // Ubuntu specific 
-  "o=${distro_id},a=${distro_codename}-security";
-  "o=${distro_id},a=${distro_codename}-backports";
-  "o=${distro_id},a=${distro_codename}-proposed";
+  "${distro_id} ${distro_codename}-security";
+  "${distro_id} ${distro_codename}-backports";
+  "${distro_id} ${distro_codename}-proposed";
 };
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From 9a3068016feffa328bf6e0f265e316eb813b7ee8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 14 Apr 2013 14:54:10 +0200
Subject: using distribution sprecific files again

---
 files/50unattended-upgrades                | 20 --------------------
 files/Debian/50unattended-upgrades         | 14 ++++++++++++++
 files/Debian/50unattended-upgrades.lenny   | 13 +++++++++++++
 files/Debian/50unattended-upgrades.squeeze | 13 +++++++++++++
 files/Debian/50unattended-upgrades.wheezy  | 14 ++++++++++++++
 files/Ubuntu/50unattended-upgrades         | 16 ++++++++++++++++
 files/lenny/50unattended-upgrades          | 13 -------------
 files/squeeze/50unattended-upgrades        | 14 --------------
 manifests/unattended_upgrades.pp           |  8 ++++----
 9 files changed, 74 insertions(+), 51 deletions(-)
 delete mode 100644 files/50unattended-upgrades
 create mode 100644 files/Debian/50unattended-upgrades
 create mode 100644 files/Debian/50unattended-upgrades.lenny
 create mode 100644 files/Debian/50unattended-upgrades.squeeze
 create mode 100644 files/Debian/50unattended-upgrades.wheezy
 create mode 100644 files/Ubuntu/50unattended-upgrades
 delete mode 100644 files/lenny/50unattended-upgrades
 delete mode 100644 files/squeeze/50unattended-upgrades

diff --git a/files/50unattended-upgrades b/files/50unattended-upgrades
deleted file mode 100644
index 329c95c..0000000
--- a/files/50unattended-upgrades
+++ /dev/null
@@ -1,20 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Origins-Pattern {
-  // Debian
-  "${distro_id} ${distro_codename}";
-  "${distro_id} ${distro_codename}-updates";
-  "${distro_id} ${distro_codename}-security";
-  "${distro_id} Backports:${distro_codename}-backports"; 
-  // Ubuntu specific 
-  "${distro_id} ${distro_codename}-security";
-  "${distro_id} ${distro_codename}-backports";
-  "${distro_id} ${distro_codename}-proposed";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-Unattended-Upgrade::MailOnlyOnError "true";
diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
new file mode 100644
index 0000000..0901ad3
--- /dev/null
+++ b/files/Debian/50unattended-upgrades
@@ -0,0 +1,14 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+        "${distro_id}:stable";
+        "${distro_id}:${distro_codename}-security";
+        "${distro_id}:${distro_codename}-updates";
+        "${distro_id} Backports:${distro_codename}-backports";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
diff --git a/files/Debian/50unattended-upgrades.lenny b/files/Debian/50unattended-upgrades.lenny
new file mode 100644
index 0000000..d55bb29
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.lenny
@@ -0,0 +1,13 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+	"Debian oldstable";
+	"Debian-Security oldstable";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
+
diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
new file mode 100644
index 0000000..38da1f4
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -0,0 +1,13 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+        "${distro_id} stable";
+        "${distro_id} ${distro_codename}-security";
+        "${distro_id} ${distro_codename}-backports";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
new file mode 100644
index 0000000..4463406
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.wheezy
@@ -0,0 +1,14 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+        "${distro_id}:testing";
+        "${distro_id}:${distro_codename}-security";
+        "${distro_id}:${distro_codename}-updates";
+        "${distro_id} Backports:${distro_codename}-backports";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
diff --git a/files/Ubuntu/50unattended-upgrades b/files/Ubuntu/50unattended-upgrades
new file mode 100644
index 0000000..25c7758
--- /dev/null
+++ b/files/Ubuntu/50unattended-upgrades
@@ -0,0 +1,16 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+  "${distro_id}:${distro_codename}-security";
+  "${distro_id}:${distro_codename}-updates";
+  "${distro_id}:${distro_codename}-backports";
+  //"${distro_id}:${distro_codename}-proposed";
+};
+
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
+Unattended-Upgrade::MailOnlyOnError "true";
diff --git a/files/lenny/50unattended-upgrades b/files/lenny/50unattended-upgrades
deleted file mode 100644
index d55bb29..0000000
--- a/files/lenny/50unattended-upgrades
+++ /dev/null
@@ -1,13 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-	"Debian oldstable";
-	"Debian-Security oldstable";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-
diff --git a/files/squeeze/50unattended-upgrades b/files/squeeze/50unattended-upgrades
deleted file mode 100644
index 0901ad3..0000000
--- a/files/squeeze/50unattended-upgrades
+++ /dev/null
@@ -1,14 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-        "${distro_id}:stable";
-        "${distro_id}:${distro_codename}-security";
-        "${distro_id}:${distro_codename}-updates";
-        "${distro_id} Backports:${distro_codename}-backports";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index c538831..f74fc81 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -7,10 +7,10 @@ class apt::unattended_upgrades {
 
   apt_conf { '50unattended-upgrades':
     source  => [
-                "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
-                'puppet:///modules/site_apt/50unattended-upgrades',
-                "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades",
-                'puppet:///modules/apt/50unattended-upgrades' ],
+                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades",
+                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ],
     require => Package['unattended-upgrades'],
   }
 
-- 
cgit v1.2.3


From 07266be25546482b021e5ba62cf155b8b0e770be Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 14 Apr 2013 15:06:30 +0200
Subject: fix unattended-upgrades dependency cycle

---
 manifests/unattended_upgrades.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index f74fc81..2f6c2a5 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -2,7 +2,7 @@ class apt::unattended_upgrades {
 
   package { 'unattended-upgrades':
     ensure  => present,
-    require => undef,
+    require => undef
   }
 
   apt_conf { '50unattended-upgrades':
-- 
cgit v1.2.3


From b45052b227b01c955226362ffd9deda9d2bb4103 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 26 May 2013 14:39:41 -0300
Subject: Updating unattended-upgrades squeeze config as oldstable (2)

---
 files/Debian/50unattended-upgrades.squeeze | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
index 38da1f4..8f4a926 100644
--- a/files/Debian/50unattended-upgrades.squeeze
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -1,9 +1,9 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Allowed-Origins {
-        "${distro_id} stable";
-        "${distro_id} ${distro_codename}-security";
-        "${distro_id} ${distro_codename}-backports";
+	"Debian oldstable";
+	"Debian-Security oldstable";
+  "${distro_id} ${distro_codename}-backports";
 };
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From 4b2e554f8f3a84433e71955664a71ae8123c0543 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 29 May 2013 12:51:18 -0300
Subject: Changing 'testing' to 'wheezy' on 50unattended-upgrades.wheezy

---
 files/Debian/50unattended-upgrades.wheezy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
index 4463406..0901ad3 100644
--- a/files/Debian/50unattended-upgrades.wheezy
+++ b/files/Debian/50unattended-upgrades.wheezy
@@ -1,7 +1,7 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Allowed-Origins {
-        "${distro_id}:testing";
+        "${distro_id}:stable";
         "${distro_id}:${distro_codename}-security";
         "${distro_id}:${distro_codename}-updates";
         "${distro_id} Backports:${distro_codename}-backports";
-- 
cgit v1.2.3


From 2e3c8fe71cec14411ccee2736f342440a7fedb92 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 31 May 2013 10:56:23 -0400
Subject: Regression: lost MailOnlyOnError for unattended-upgrades

Since only wheezy supports it, let's add it back only for wheezy.

Signed-off-by: Gabriel Filion <gabster@lelutin.ca>
---
 files/Debian/50unattended-upgrades.wheezy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
index 0901ad3..e787bf5 100644
--- a/files/Debian/50unattended-upgrades.wheezy
+++ b/files/Debian/50unattended-upgrades.wheezy
@@ -12,3 +12,4 @@ APT::Periodic::Download-Upgradeable-Packages "1";
 APT::Periodic::Unattended-Upgrade "1";
 
 Unattended-Upgrade::Mail "root";
+Unattended-Upgrade::MailOnlyOnError "true";
-- 
cgit v1.2.3


From 1a72a99693c1d77bfe891546408f88264fca98ee Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 27 Jun 2013 11:58:39 -0400
Subject: remove unnecessary override and accidentally merge issue

---
 manifests/unattended_upgrades.pp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 17455fe..80939e3 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,8 +1,7 @@
 class apt::unattended_upgrades {
 
   package { 'unattended-upgrades':
-    ensure  => present,
-    require => Exec[refresh_apt]
+    ensure  => present
   }
 
   apt_conf { '50unattended-upgrades':
@@ -13,8 +12,4 @@ class apt::unattended_upgrades {
                 "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ],
     require => Package['unattended-upgrades'],
   }
-
-  Apt_conf['50unattended-upgrades'] {
-    notify => undef
-  }
 }
-- 
cgit v1.2.3


From c99227ad55e8d266a77ad5dfb672147eec6e1c3b Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 27 Jul 2013 06:14:47 -0400
Subject: Make custom_sources_list into a class paramter

and thus remove the last global variable.
---
 README            | 28 ++++++++++++----------------
 manifests/init.pp |  5 +++--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/README b/README
index 35a88b2..90301be 100644
--- a/README
+++ b/README
@@ -113,22 +113,6 @@ the site_apt modules' files directory that is named the same as the
 host. (example: site_apt/files/some.host.com/03clean, or
 site_apt/files/some.host.com/03clean_vserver)
 
-Variables
-=========
-
-$custom_sources_list
---------------------
-
-By default this module will use a basic apt/sources.list template with
-a generic Debian mirror. If you need to set more specific sources,
-e.g. changing the sections included in the source, etc. you can set
-this variable to the content that you desire to use instead.
-
-For example, setting the following variable before including this class will
-pull in the templates/site_apt/sources.list file:
-
-  $custom_sources_list = template('site_apt/sources.list')
-
 Classes
 =======
 
@@ -214,6 +198,18 @@ Class parameters:
 
     class { 'apt': custom_preferences => false }
   
+* custom_sources_list
+
+  By default this module will use a basic apt/sources.list template with
+  a generic Debian mirror. If you need to set more specific sources,
+  e.g. changing the sections included in the source, etc. you can set
+  this variable to the content that you desire to use instead.
+
+  For example, setting this variable will pull in the
+  templates/site_apt/sources.list file:
+
+  class { 'apt': custom_sources_list => template('site_apt/sources.list') }
+
 * codename
 
   Contains the codename ("squeeze", "wheezy", ...) of the client's release. While
diff --git a/manifests/init.pp b/manifests/init.pp
index 33eac37..7550aaa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,6 +15,7 @@ class apt(
   $ubuntu_url = $apt::params::ubuntu_url,
   $repos = $apt::params::repos,
   $custom_preferences = $apt::params::custom_preferences,
+  $custom_sources_list = '',
   $disable_update = $apt::params::disable_update,
   $custom_key_dir = $apt::params::custom_key_dir
 ) inherits apt::params {
@@ -53,9 +54,9 @@ class apt(
   $next_codename = debian_nextcodename($codename)
   $next_release = debian_nextrelease($release)
 
-  $sources_content = $::custom_sources_list ? {
+  $sources_content = $custom_sources_list ? {
     ''      => template( "apt/${::operatingsystem}/sources.list.erb"),
-    default => $::custom_sources_list
+    default => $custom_sources_list
   }
   file {
     # include main, security and backports
-- 
cgit v1.2.3


From f8aa2ef8722592b61fcbc10959c571ff19dee573 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 8 Dec 2013 21:58:20 +0000
Subject: Drop Debian Etch and Lenny compatibility.

Both have been unsupported for ages.
---
 README                                                |  5 ++---
 lib/puppet/parser/functions/debian_nextcodename.rb    |  2 --
 lib/puppet/parser/functions/debian_release_version.rb |  2 --
 templates/Debian/sources.list.erb                     | 14 --------------
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/README b/README
index 90301be..b241739 100644
--- a/README
+++ b/README
@@ -130,9 +130,8 @@ Class parameters:
 
 * use_volatile
 
-  If this variable is set to true the Debian Volatile sources (until
-  Lenny) or CODENAME-updates (such as squeeze-updates, supported since
-  Squeeze) are added.
+  If this variable is set to true the CODENAME-updates sources (such as
+  squeeze-updates) are added.
 
   By default this is false for backward compatibility with older
   versions of this module.
diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
index 3d5c3bd..f3190ef 100644
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ b/lib/puppet/parser/functions/debian_nextcodename.rb
@@ -1,8 +1,6 @@
 module Puppet::Parser::Functions
   newfunction(:debian_nextcodename, :type => :rvalue) do |args|
     case args[0]
-      when "etch"    then "lenny"
-      when "lenny"   then "squeeze"
       when "squeeze" then "wheezy"
       when "wheezy"  then "jessie"
       when "jessie"  then "sid"
diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb
index 0abe90e..0a57fd3 100644
--- a/lib/puppet/parser/functions/debian_release_version.rb
+++ b/lib/puppet/parser/functions/debian_release_version.rb
@@ -1,8 +1,6 @@
 module Puppet::Parser::Functions
   newfunction(:debian_release_version, :type => :rvalue) do |args|
     case args[0]
-      when 'etch'         then '4.0'
-      when 'lenny'        then '5.0'
       when 'squeeze'      then '6.0'
       when 'wheezy'       then '7.0'
       else ''
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 49cf38c..65b5945 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -34,19 +34,12 @@ deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
 <% if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no volatile archive for <%= release %>
 <% else -%>
-<% if (codename == "lenny" || codename == "etch") -%>
-deb <%= volatile_url=scope.lookupvar('apt::volatile_url') %> <%= codename %>/volatile <%= lrepos %>
-<% if include_src -%>
-deb-src <%= volatile_url %> <%= codename %>/volatile <%= lrepos %>
-<% end -%>
-<% else -%>
 deb <%= debian_url %> <%= codename %>-updates <%= lrepos %>
 <% if include_src -%>
 deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
 <% end -%>
 <% end -%>
 <% end -%>
-<% end -%>
 
 <% if next_release=scope.lookupvar('apt::use_next_release') -%>
 ### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %>
@@ -72,12 +65,6 @@ deb-src <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
 <% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
 # There is no volatile archive for <%= next_release %>
 <% else -%>
-<% if (next_codename == "lenny" || next_codename == "etch") -%>
-deb <%= volatile_url %> <%= next_codename %>/volatile <%= lrepos %>
-<% if include_src then -%>
-deb-src <%= volatile_url %> <%= next_codename %>/volatile <%= lrepos %>
-<% end -%>
-<% else -%>
 deb <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
 <% if include_src then -%>
 deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
@@ -85,4 +72,3 @@ deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
 <% end -%>
 <% end -%>
 <% end -%>
-<% end -%>
-- 
cgit v1.2.3


From f286b0ed860660ce255740f2f43123d024553bcc Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 8 Dec 2013 21:58:38 +0000
Subject: Remove Lenny-related comment that was made obsolete a year ago by
 commit 822950.

---
 manifests/preferences_snippet.pp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index cbc83d2..0c7b7bb 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -34,9 +34,6 @@ define apt::preferences_snippet (
     owner  => root, group => 0, mode => '0644';
   }
 
-  # This should really work in the same manner as sources_list and apt_conf
-  # snippets, but since the preferences.d directory cannot be used in Debian
-  # lenny, we can't generalize without going into ugly special-casing.
   case $source {
     '': {
       case $release {
-- 
cgit v1.2.3


From 128410f64363f717fc0d5a13faf769843a0b733c Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 8 Dec 2013 22:00:22 +0000
Subject: Adapt documentation to take into account we haven't been supporting
 Lenny for more than a year.

---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index b241739..0057d87 100644
--- a/README
+++ b/README
@@ -180,8 +180,8 @@ Class parameters:
 
 * custom_preferences
 
-  Since Debian Lenny's version of APT doesn't support the use of the
-  preferences.d directory for putting fragments of 'preferences', this
+  For historical reasons (Debian Lenny's version of APT did not support the use
+  of the preferences.d directory for putting fragments of 'preferences'), this
   module will manage a default generic apt/preferences file with more
   recent releases pinned to very low values so that any package
   installation will not accidentally pull in packages from those suites
-- 
cgit v1.2.3


From 4bd4dd254263003a404a1573abd50307b04057c8 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 8 Jan 2014 21:27:05 +0100
Subject: use stdlib instead of the common module

---
 manifests/dselect.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifests/dselect.pp b/manifests/dselect.pp
index 6feeb9f..2b99a43 100644
--- a/manifests/dselect.pp
+++ b/manifests/dselect.pp
@@ -1,9 +1,10 @@
+# manage dselect, like
+# suppressing the annoying help texts
 class apt::dselect {
 
-  # suppress annoying help texts of dselect
-  line { 'dselect_expert':
-      file => '/etc/dpkg/dselect.cfg',
-      line => 'expert',
+  file_line { 'dselect_expert':
+    path => '/etc/dpkg/dselect.cfg',
+    line => 'expert',
   }
 
   package { 'dselect': ensure => installed }
-- 
cgit v1.2.3


From 9d56396a0439a19dd6cd3a09a5d1a9f7d6345778 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 8 Jan 2014 21:28:42 +0100
Subject: use the new style common module

---
 manifests/init.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 7550aaa..034d79e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -111,9 +111,8 @@ class apt(
   # backports uses the normal archive key now
   package { 'debian-backports-keyring': ensure => absent }
 
-  include common::moduledir
+  common::module_dir { 'apt': }
   $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
-  modules_dir { 'apt': }
 
   if $custom_key_dir {
     file { "${apt_base_dir}/keys.d":
-- 
cgit v1.2.3


From 082a2f77687b5c9dad63f5b30c672cc495506cd9 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 21 Mar 2014 12:03:56 -0400
Subject: add jessie preferences file

---
 templates/Debian/preferences_jessie.erb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 templates/Debian/preferences_jessie.erb

diff --git a/templates/Debian/preferences_jessie.erb b/templates/Debian/preferences_jessie.erb
new file mode 100644
index 0000000..4f8e95c
--- /dev/null
+++ b/templates/Debian/preferences_jessie.erb
@@ -0,0 +1,14 @@
+Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %>
+Package: *
+Pin: release o=Debian,n=<%= codename %>
+Pin-Priority: 990
+
+Explanation: Debian sid
+Package: *
+Pin: release o=Debian,n=sid
+Pin-Priority: 1
+
+Explanation: Debian fallback
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
-- 
cgit v1.2.3


From 7006cda33309ef95c792ccd77fef750dd8fe15e7 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 21 Mar 2014 12:07:19 -0400
Subject: add apticron_jessie symlink, same version in wheezy and sid

---
 templates/Debian/apticron_jessie.erb | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 templates/Debian/apticron_jessie.erb

diff --git a/templates/Debian/apticron_jessie.erb b/templates/Debian/apticron_jessie.erb
new file mode 120000
index 0000000..a9a3a6f
--- /dev/null
+++ b/templates/Debian/apticron_jessie.erb
@@ -0,0 +1 @@
+apticron_wheezy.erb
\ No newline at end of file
-- 
cgit v1.2.3


From 98ad878c1a0d2dfbeb9ff91d155ac759e12f1d4e Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 21 Mar 2014 12:09:32 -0400
Subject: add apt listchanges template symlink for jessie - same as the others

---
 templates/Debian/listchanges_jessie.erb | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 templates/Debian/listchanges_jessie.erb

diff --git a/templates/Debian/listchanges_jessie.erb b/templates/Debian/listchanges_jessie.erb
new file mode 120000
index 0000000..74ab496
--- /dev/null
+++ b/templates/Debian/listchanges_jessie.erb
@@ -0,0 +1 @@
+listchanges_lenny.erb
\ No newline at end of file
-- 
cgit v1.2.3


From af616677e6558d1ad2bfdcdf02dc318bec192363 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 18 Apr 2014 10:59:26 +0200
Subject: address puppet 3.x deprecation warnings

---
 templates/20proxy.erb                     |  2 +-
 templates/Debian/apticron_lenny.erb       | 18 +++++-----
 templates/Debian/apticron_squeeze.erb     | 18 +++++-----
 templates/Debian/apticron_wheezy.erb      | 18 +++++-----
 templates/Debian/sources.list.erb         | 56 +++++++++++++++----------------
 templates/preferences_snippet.erb         |  6 ++--
 templates/preferences_snippet_release.erb |  6 ++--
 7 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/templates/20proxy.erb b/templates/20proxy.erb
index ea706b6..520e7b1 100644
--- a/templates/20proxy.erb
+++ b/templates/20proxy.erb
@@ -1,5 +1,5 @@
 // This file is managed by Puppet
 // all local modifications will be overwritten
 
-Acquire::http { Proxy "<%= proxy %>:<%= port %>"; };
+Acquire::http { Proxy "<%= @proxy %>:<%= @port %>"; };
 Acquire::HTTP::Proxy::bugs.debian.org "DIRECT";
diff --git a/templates/Debian/apticron_lenny.erb b/templates/Debian/apticron_lenny.erb
index aad9985..86b0997 100644
--- a/templates/Debian/apticron_lenny.erb
+++ b/templates/Debian/apticron_lenny.erb
@@ -24,9 +24,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # of "hostname -f" for the system name in the mails it generates
 #
 # SYSTEM="foobar.example.com"
-<%- unless scope.lookupvar('apt::apticron::system').to_s == "false" -%>
-<%= "SYSTEM=\"#{scope.lookupvar('apt::apticron::system')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
+SYSTEM="<%= v %>"
+<% end -%>
 
 #
 # Set IPADDRESSNUM if you would like to configure the maximal number of IP
@@ -34,9 +34,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # family type (inet, inet6), if available.
 #
 # IPADDRESSNUM="1"
-<%- unless scope.lookupvar('apt::apticron::ipaddressnum').to_s == "false" -%>
-<%= "IPADDRESSNUM=\"#{scope.lookupvar('apt::apticron::ipaddressnum')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
+IPADDRESSNUM="<%= v %>"
+<% end -%>
 
 #
 # Set IPADDRESSES to a whitespace seperated list of reachable addresses for
@@ -44,7 +44,7 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # "ip" command
 #
 # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-<%- unless scope.lookupvar('apt::apticron::ipaddresses').to_s == "false" -%>
-<%= "IPADDRESSES=\"#{scope.lookupvar('apt::apticron::ipaddresses')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
+IPADDRESSES="<%= v %>"
+<% end -%>
 
diff --git a/templates/Debian/apticron_squeeze.erb b/templates/Debian/apticron_squeeze.erb
index 580179e..05b7c9b 100644
--- a/templates/Debian/apticron_squeeze.erb
+++ b/templates/Debian/apticron_squeeze.erb
@@ -26,9 +26,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # of "hostname -f" for the system name in the mails it generates
 #
 # SYSTEM="foobar.example.com"
-<%- unless scope.lookupvar('apt::apticron::system').to_s == "false" -%>
-<%= "SYSTEM=\"#{scope.lookupvar('apt::apticron::system')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
+SYSTEM="<%= v %>"
+<% end -%>
 
 
 #
@@ -37,9 +37,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # family type (inet, inet6), if available.
 #
 # IPADDRESSNUM="1"
-<%- unless scope.lookupvar('apt::apticron::ipaddressnum').to_s == "false" -%>
-<%= "IPADDRESSNUM=\"#{scope.lookupvar('apt::apticron::ipaddressnum')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
+IPADDRESSNUM="<%= v %>"
+<% end -%>
 
 
 #
@@ -48,9 +48,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # "ip" command
 #
 # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-<%- unless scope.lookupvar('apt::apticron::ipaddresses').to_s == "false" -%>
-<%= "IPADDRESSES=\"#{scope.lookupvar('apt::apticron::ipaddresses')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
+IPADDRESSES="<%= v %>"
+<% end -%>
 
 
 #
diff --git a/templates/Debian/apticron_wheezy.erb b/templates/Debian/apticron_wheezy.erb
index d8c8804..655854e 100644
--- a/templates/Debian/apticron_wheezy.erb
+++ b/templates/Debian/apticron_wheezy.erb
@@ -25,9 +25,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # of "hostname -f" for the system name in the mails it generates
 #
 # SYSTEM="foobar.example.com"
-<%- unless scope.lookupvar('apt::apticron::system').to_s == "false" -%> 
-<%= "SYSTEM=\"#{scope.lookupvar('apt::apticron::system')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
+SYSTEM="<%= v %>"
+<% end -%>
 
 #
 # Set IPADDRESSNUM if you would like to configure the maximal number of IP
@@ -35,9 +35,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # family type (inet, inet6), if available.
 #
 # IPADDRESSNUM="1"
-<%- unless scope.lookupvar('apt::apticron::ipaddressnum').to_s == "false" -%>
-<%= "IPADDRESSNUM=\"#{scope.lookupvar('apt::apticron::ipaddressnum')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
+IPADDRESSNUM="<%= v %>"
+<% end -%>
 
 #
 # Set IPADDRESSES to a whitespace separated list of reachable addresses for
@@ -45,9 +45,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
 # "ip" command
 #
 # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-<%- unless scope.lookupvar('apt::apticron::ipaddresses').to_s == "false" -%>
-<%= "IPADDRESSES=\"#{scope.lookupvar('apt::apticron::ipaddresses')}\"" %>
-<%- end -%>
+<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
+IPADDRESSES=<%= v %>"
+<% end -%>
 
 #
 # Set NOTIFY_HOLDS="0" if you don't want to be notified about new versions of
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 65b5945..dee6ce5 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -5,7 +5,7 @@
 
 # basic
 deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
-<% if scope.lookupvar('apt::include_src')  -%>
+<% if include_src=scope.lookupvar('apt::include_src')  -%>
 deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 <% end -%>
 
@@ -14,61 +14,61 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 # There is no security support for <%= release %>
 <% else -%>
 deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
-<% end -%>
-<% end -%>
+<%   end
+   end -%>
 
 # backports
 <% if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no backports archive for <%= release %>
 <% else -%>
 deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
-<% end -%>
-<% end -%>
+<%   end
+   end -%>
 
 <% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
 # volatile
-<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
+<%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no volatile archive for <%= release %>
-<% else -%>
+<%   else -%>
 deb <%= debian_url %> <%= codename %>-updates <%= lrepos %>
-<% if include_src -%>
+<%     if include_src -%>
 deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
-<% end -%>
-<% end -%>
-<% end -%>
+<%     end
+     end
+   end -%>
 
 <% if next_release=scope.lookupvar('apt::use_next_release') -%>
 ### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %>
 
 # basic
 deb <%= debian_url %> <%= next_codename %> <%= lrepos %>
-<% if include_src then -%>
+<%   if include_src -%>
 deb-src <%= debian_url %> <%= next_codename %> <%= lrepos %>
-<% end -%>
+<%   end -%>
 
 # security
-<% if (next_release == "unstable" || next_release == "experimental") -%>
+<%   if (next_release == "unstable" || next_release == "experimental") -%>
 # There is no security support for <%= next_release %>
-<% else -%>
+<%   else -%>
 deb <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
-<% if include_src then -%>
+<%     if include_src then -%>
 deb-src <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
-<% end -%>
-<% end -%>
+<%     end
+     end -%>
 
-<% if use_volatile -%>
+<%   if use_volatile -%>
 # volatile
-<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
+<%     if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
 # There is no volatile archive for <%= next_release %>
-<% else -%>
+<%     else -%>
 deb <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
-<% if include_src then -%>
+<%       if include_src -%>
 deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
-<% end -%>
-<% end -%>
-<% end -%>
-<% end -%>
+<%       end
+       end
+     end
+   end -%>
diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb
index b7acaab..903e73d 100644
--- a/templates/preferences_snippet.erb
+++ b/templates/preferences_snippet.erb
@@ -1,4 +1,4 @@
-Package: <%= real_package %>
-Pin: <%= pin %>
-Pin-Priority: <%= priority %>
+Package: <%= @real_package %>
+Pin: <%= @pin %>
+Pin-Priority: <%= @priority %>
 
diff --git a/templates/preferences_snippet_release.erb b/templates/preferences_snippet_release.erb
index 845d23f..b95d3f8 100644
--- a/templates/preferences_snippet_release.erb
+++ b/templates/preferences_snippet_release.erb
@@ -1,4 +1,4 @@
-Package: <%= real_package %>
-Pin: release a=<%= release %>
-Pin-Priority: <%= priority %>
+Package: <%= @real_package %>
+Pin: release a=<%= @release %>
+Pin-Priority: <%= @priority %>
 
-- 
cgit v1.2.3


From 5a8d214529429b5dd898e0df29d69e0acf5271df Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 28 Oct 2014 14:02:57 -0400
Subject: Change default 50unattended-upgrades on Debian

* Use squeeze-lts origin on squeeze
* All other releases use newer Origins-Pattern format
* Drop support for lenny
---
 files/Debian/50unattended-upgrades         | 12 ++++++------
 files/Debian/50unattended-upgrades.lenny   | 13 -------------
 files/Debian/50unattended-upgrades.squeeze |  7 ++++---
 files/Debian/50unattended-upgrades.wheezy  | 15 ---------------
 4 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 files/Debian/50unattended-upgrades.lenny
 delete mode 100644 files/Debian/50unattended-upgrades.wheezy

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
index 0901ad3..88f4ab8 100644
--- a/files/Debian/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades
@@ -1,11 +1,11 @@
 // this file is managed by puppet !
 
-Unattended-Upgrade::Allowed-Origins {
-        "${distro_id}:stable";
-        "${distro_id}:${distro_codename}-security";
-        "${distro_id}:${distro_codename}-updates";
-        "${distro_id} Backports:${distro_codename}-backports";
-};
+Unattended-Upgrade::Origins-Pattern {
+//      "o=Debian,n=${distro-codename}";
+//      "o=Debian,n=${distro-codename}-updates";
+//      "o=Debian,n=${distro_codename}-proposed-updates";
+        "o=Debian,n=${distro_codename},l=Debian-Security";
+}
 
 APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Download-Upgradeable-Packages "1";
diff --git a/files/Debian/50unattended-upgrades.lenny b/files/Debian/50unattended-upgrades.lenny
deleted file mode 100644
index d55bb29..0000000
--- a/files/Debian/50unattended-upgrades.lenny
+++ /dev/null
@@ -1,13 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-	"Debian oldstable";
-	"Debian-Security oldstable";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-
diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
index 8f4a926..e7ba290 100644
--- a/files/Debian/50unattended-upgrades.squeeze
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -1,9 +1,10 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Allowed-Origins {
-	"Debian oldstable";
-	"Debian-Security oldstable";
-  "${distro_id} ${distro_codename}-backports";
+//  "${distro-id} oldstable";
+//  "${distro_id} ${distro_codename}-backports";
+    "${distro-id} ${distro-codename}-security";
+    "${distro-id} ${distro-codename}-lts";
 };
 
 APT::Periodic::Update-Package-Lists "1";
diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
deleted file mode 100644
index e787bf5..0000000
--- a/files/Debian/50unattended-upgrades.wheezy
+++ /dev/null
@@ -1,15 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-        "${distro_id}:stable";
-        "${distro_id}:${distro_codename}-security";
-        "${distro_id}:${distro_codename}-updates";
-        "${distro_id} Backports:${distro_codename}-backports";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-Unattended-Upgrade::MailOnlyOnError "true";
-- 
cgit v1.2.3


From 0a1eee280f8fad6cdcdde806ffb1d172877da505 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 29 Oct 2014 18:14:36 -0400
Subject: Fix default 50unattended-upgrades because of Debian bug #704087

---
 files/Debian/50unattended-upgrades | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
index 88f4ab8..78c7187 100644
--- a/files/Debian/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades
@@ -1,10 +1,7 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Origins-Pattern {
-//      "o=Debian,n=${distro-codename}";
-//      "o=Debian,n=${distro-codename}-updates";
-//      "o=Debian,n=${distro_codename}-proposed-updates";
-        "o=Debian,n=${distro_codename},l=Debian-Security";
+        "o=Debian,a=stable,l=Debian-Security";
 }
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From fb9e13eebf00af2cd6a92eb600a1dd85d3eec5b2 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 29 Oct 2014 18:40:16 -0400
Subject: Add oldstable to default 50unattended-upgrades

---
 files/Debian/50unattended-upgrades | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
index 78c7187..075f680 100644
--- a/files/Debian/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades
@@ -1,6 +1,7 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Origins-Pattern {
+        "o=Debian,a=oldstable,l=Debian-Security";
         "o=Debian,a=stable,l=Debian-Security";
 }
 
-- 
cgit v1.2.3


From c9ae59e1b72d41518160ff4c7b430573b10254a3 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 31 Oct 2014 14:09:59 -0400
Subject: Fixes placeholders in 50unattended-upgrades.squeeze

---
 files/Debian/50unattended-upgrades.squeeze | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
index e7ba290..77f715d 100644
--- a/files/Debian/50unattended-upgrades.squeeze
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -3,8 +3,8 @@
 Unattended-Upgrade::Allowed-Origins {
 //  "${distro-id} oldstable";
 //  "${distro_id} ${distro_codename}-backports";
-    "${distro-id} ${distro-codename}-security";
-    "${distro-id} ${distro-codename}-lts";
+    "${distro_id} ${distro_codename}-security";
+    "${distro_id} ${distro_codename}-lts";
 };
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From 671610fab54d6cc65f59143fe1cd6c992d3e48d8 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 5 Dec 2014 21:29:09 -0500
Subject: flip around security support for debian

with the release of squeeze-lts, the current way we deal with security
sources is problemaic. by flipping things around we hope to make the
files contents more stable.
---
 templates/Debian/sources.list.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 65b5945..00f3618 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -10,13 +10,13 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 <% end -%>
 
 # security
-<% if ((release=scope.lookupvar('apt::release')) == "unstable" || release == "experimental") -%>
-# There is no security support for <%= release %>
-<% else -%>
+<% if ((release=scope.lookupvar('apt::release')) == "stable" || release == "oldstable") -%>
 deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %>
 <% if include_src -%>
 deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
 <% end -%>
+<% else -%>
+# There is no security support for <%= release %>
 <% end -%>
 
 # backports
-- 
cgit v1.2.3


From 7c68c19973518841ba2462371b9d4b4d4f1da37e Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 6 Dec 2014 00:52:59 -0500
Subject: make it optional to end sources in ".list"

---
 manifests/sources_list.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp
index 3367f83..aefad2d 100644
--- a/manifests/sources_list.pp
+++ b/manifests/sources_list.pp
@@ -15,22 +15,24 @@ define apt::sources_list (
 
   include apt::dot_d_directories
 
+  $realname = regsubst($name, '\.list$', '')
+
   # One would expect the 'file' resource on sources.list.d to trigger an
   # apt-get update when files are added or modified in the directory, but it
   # apparently doesn't.
-  file { "/etc/apt/sources.list.d/${name}":
+  file { "/etc/apt/sources.list.d/${realname}.list":
     ensure => $ensure,
     owner  => root, group => 0, mode => '0644',
     notify => Exec['refresh_apt'],
   }
 
   if $source {
-    File["/etc/apt/sources.list.d/${name}"] {
+    File["/etc/apt/sources.list.d/${realname}.list"] {
       source => $source,
     }
   }
   else {
-    File["/etc/apt/sources.list.d/${name}"] {
+    File["/etc/apt/sources.list.d/${realname}.list"] {
       content => $content,
     }
   }
-- 
cgit v1.2.3


From 18a2525b7ab8f25790942e72774f118f94dbb0d1 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 6 Dec 2014 12:14:50 -0500
Subject: Update the README to show that .list is optional for sources

---
 README | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 0057d87..0dec9d3 100644
--- a/README
+++ b/README
@@ -440,11 +440,13 @@ apt::sources_list
 Creates a file in the apt/sources.list.d directory to easily add additional apt
 sources. One can use either the 'source' meta-parameter to specify a list of
 static files to include from the puppet fileserver or the 'content'
-meta-parameter to define content inline or with the help of a template.
+meta-parameter to define content inline or with the help of a template. Ending
+the resource name in '.list' is optional since this extension will
+automatically be added to the created file.
 
 Example:
 
-  apt::sources_list { 'company_internals.list':
+  apt::sources_list { 'company_internals':
     source => [ "puppet:///modules/site_apt/${::fqdn}/company_internals.list",
                 'puppet:///modules/site_apt/company_internals.list' ],
   }
-- 
cgit v1.2.3


From 8e8fa56271ca8051447d201e40b1c04fc07dc727 Mon Sep 17 00:00:00 2001
From: Guillaume Marde <guillaume@resist.ca>
Date: Sat, 6 Dec 2014 16:03:21 -0500
Subject: Added a license.  That's a bit cocky, but we're just licensing this
 stuff as GPLv3, which is part of the basis of unity of most organizations
 involved in the creation of those. If you absolutely wanna pull out of this
 shit let us know, we'll try to figure something out ; most likely we'll stop
 using your part and rewrite them on our own (but better :D).

---
 gpl.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 674 insertions(+)
 create mode 100644 gpl.txt

diff --git a/gpl.txt b/gpl.txt
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/gpl.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-- 
cgit v1.2.3


From 54532e917965cba5989b3781071dd54af702752e Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 6 Dec 2014 21:55:20 -0500
Subject: rephrase documentation of option .list

as suggested during review
---
 README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 0dec9d3..2ebc1b7 100644
--- a/README
+++ b/README
@@ -441,8 +441,8 @@ Creates a file in the apt/sources.list.d directory to easily add additional apt
 sources. One can use either the 'source' meta-parameter to specify a list of
 static files to include from the puppet fileserver or the 'content'
 meta-parameter to define content inline or with the help of a template. Ending
-the resource name in '.list' is optional since this extension will
-automatically be added to the created file.
+the resource name in '.list' is optional: it will be automatically added to the
+file name if not present in the resource name.
 
 Example:
 
-- 
cgit v1.2.3


From 85c7554c4bb06130ab3e88170842dc1b2ddbb186 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 7 Feb 2015 16:12:55 +0000
Subject: Add support for Squeeze LTS.

---
 README                                   |  8 ++++++++
 manifests/init.pp                        |  2 ++
 manifests/params.pp                      |  2 ++
 templates/Debian/preferences_squeeze.erb |  5 +++++
 templates/Debian/sources.list.erb        | 12 ++++++++++++
 5 files changed, 29 insertions(+)

diff --git a/README b/README
index 0057d87..5e5c7c5 100644
--- a/README
+++ b/README
@@ -128,6 +128,14 @@ Example usage:
 
 Class parameters:
 
+* use_lts
+
+  If this variable is set to true the CODENAME-lts sources (such as
+  squeeze-lts) are added.
+
+  By default this is false for backward compatibility with older
+  versions of this module.
+
 * use_volatile
 
   If this variable is set to true the CODENAME-updates sources (such as
diff --git a/manifests/init.pp b/manifests/init.pp
index 7550aaa..2814013 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -5,12 +5,14 @@
 
 class apt(
   $codename = $apt::params::codename,
+  $use_lts = $apt::params::use_lts,
   $use_volatile = $apt::params::use_volatile,
   $include_src = $apt::params::include_src,
   $use_next_release = $apt::params::use_next_release,
   $debian_url = $apt::params::debian_url,
   $security_url = $apt::params::security_url,
   $backports_url = $apt::params::backports_url,
+  $lts_url = $apt::params::lts_url,
   $volatile_url = $apt::params::volatile_url,
   $ubuntu_url = $apt::params::ubuntu_url,
   $repos = $apt::params::repos,
diff --git a/manifests/params.pp b/manifests/params.pp
index 12273ac..54fd13e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,5 +1,6 @@
 class apt::params () {
   $codename = $::lsbdistcodename
+  $use_lts = false
   $use_volatile = false
   $include_src = false
   $use_next_release = false
@@ -9,6 +10,7 @@ class apt::params () {
     'wheezy' => $debian_url,
     default  => 'http://backports.debian.org/debian-backports/',
   }
+  $lts_url = $debian_url
   $volatile_url = 'http://volatile.debian.org/debian-volatile/'
   $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
   $repos = 'auto'
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb
index efe7720..838b3a1 100644
--- a/templates/Debian/preferences_squeeze.erb
+++ b/templates/Debian/preferences_squeeze.erb
@@ -8,6 +8,11 @@ Package: *
 Pin: release o=Debian,n=<%= codename %>-updates
 Pin-Priority: 990
 
+Explanation: Debian <%= codename %>-lts
+Package: *
+Pin: release o=Debian,n=<%= codename %>-lts
+Pin-Priority: 990
+
 Explanation: Debian <%= next_codename=scope.lookupvar('apt::next_codename') %>
 Package: *
 Pin: release o=Debian,n=<%= next_codename %>
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 65b5945..7b99df6 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -41,6 +41,18 @@ deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
 <% end -%>
 <% end -%>
 
+<% if use_lts=scope.lookupvar('apt::use_lts') -%>
+# LTS
+<% if release != "oldstable" -%>
+# There is no LTS archive for <%= release %>
+<% else -%>
+deb <%= debian_url %> <%= codename %>-lts <%= lrepos %>
+<% if include_src -%>
+deb-src <%= debian_url %> <%= codename %>-lts <%= lrepos %>
+<% end -%>
+<% end -%>
+<% end -%>
+
 <% if next_release=scope.lookupvar('apt::use_next_release') -%>
 ### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %>
 
-- 
cgit v1.2.3


From 3bd6f73973f0a4b744f75d3a9b2c73b15e76603b Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 28 Feb 2015 13:01:14 +0000
Subject: Add missing "include common::moduledir".

Without this, $common::moduledir::module_dir_path is empty.
---
 manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 0fb4f1b..68856cc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -113,6 +113,7 @@ class apt(
   # backports uses the normal archive key now
   package { 'debian-backports-keyring': ensure => absent }
 
+  include common::moduledir
   common::module_dir { 'apt': }
   $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
 
-- 
cgit v1.2.3


From 21ac1a9bf4bc5b9059469d8f6562ff493d18eca7 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 28 Oct 2014 22:44:05 +0100
Subject: + preferences_utopic.erb

---
 templates/Ubuntu/preferences_utopic.erb | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 templates/Ubuntu/preferences_utopic.erb

diff --git a/templates/Ubuntu/preferences_utopic.erb b/templates/Ubuntu/preferences_utopic.erb
new file mode 120000
index 0000000..3debe4f
--- /dev/null
+++ b/templates/Ubuntu/preferences_utopic.erb
@@ -0,0 +1 @@
+preferences_maverick.erb
\ No newline at end of file
-- 
cgit v1.2.3


From dc341e60ad778cd6a85339b74ec41472f805e9a3 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 31 Mar 2015 11:50:05 +0200
Subject: fix duplicate <main> ubuntu backports entry

---
 templates/Ubuntu/sources.list.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index c1a6115..8d2585d 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -20,7 +20,7 @@ deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
 <% end -%>
 
 # backports
-deb <%= ubuntu_url %> <%= codename %>-backports main <%= lrepos %>
+deb <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
 <% if include_src -%>
 deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
 <% end -%>
-- 
cgit v1.2.3


From 9192785c452ce2cfa0f58984d3aebdcaf841113a Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 27 Jul 2013 13:38:27 -0400
Subject: make it possible to opt out of MailOnlyOnError

This combines all files into one template. It should make maintenance
easier.
---
 files/Debian/50unattended-upgrades         | 12 ------------
 files/Debian/50unattended-upgrades.squeeze | 14 --------------
 files/Ubuntu/50unattended-upgrades         | 16 ----------------
 manifests/unattended_upgrades.pp           | 16 ++++++++++------
 templates/50unattended-upgrades.erb        | 26 ++++++++++++++++++++++++++
 5 files changed, 36 insertions(+), 48 deletions(-)
 delete mode 100644 files/Debian/50unattended-upgrades
 delete mode 100644 files/Debian/50unattended-upgrades.squeeze
 delete mode 100644 files/Ubuntu/50unattended-upgrades
 create mode 100644 templates/50unattended-upgrades.erb

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
deleted file mode 100644
index 075f680..0000000
--- a/files/Debian/50unattended-upgrades
+++ /dev/null
@@ -1,12 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Origins-Pattern {
-        "o=Debian,a=oldstable,l=Debian-Security";
-        "o=Debian,a=stable,l=Debian-Security";
-}
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
deleted file mode 100644
index 77f715d..0000000
--- a/files/Debian/50unattended-upgrades.squeeze
+++ /dev/null
@@ -1,14 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-//  "${distro-id} oldstable";
-//  "${distro_id} ${distro_codename}-backports";
-    "${distro_id} ${distro_codename}-security";
-    "${distro_id} ${distro_codename}-lts";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
diff --git a/files/Ubuntu/50unattended-upgrades b/files/Ubuntu/50unattended-upgrades
deleted file mode 100644
index 25c7758..0000000
--- a/files/Ubuntu/50unattended-upgrades
+++ /dev/null
@@ -1,16 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-  "${distro_id}:${distro_codename}-security";
-  "${distro_id}:${distro_codename}-updates";
-  "${distro_id}:${distro_codename}-backports";
-  //"${distro_id}:${distro_codename}-proposed";
-};
-
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-Unattended-Upgrade::MailOnlyOnError "true";
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 80939e3..b63b483 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,15 +1,19 @@
-class apt::unattended_upgrades {
+class apt::unattended_upgrades (
+  $config_content = undef,
+  $mailonlyonerror = true,
+) {
 
   package { 'unattended-upgrades':
     ensure  => present
   }
 
+  $file_content = $config_content ? {
+    undef   => template('apt/50unattended-upgrades.erb'),
+    default => $config_content
+  }
+
   apt_conf { '50unattended-upgrades':
-    source  => [
-                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
-                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades",
-                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
-                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ],
+    content => $file_content,
     require => Package['unattended-upgrades'],
   }
 }
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
new file mode 100644
index 0000000..0ba0d7e
--- /dev/null
+++ b/templates/50unattended-upgrades.erb
@@ -0,0 +1,26 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+<% if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
+  "${distro_id}:${distro_codename}-security";
+  "${distro_id}:${distro_codename}-updates";
+  "${distro_id}:${distro_codename}-backports";
+<% else -%>
+<% if scope.lookupvar('::lsbdistcodename') == 'squeeze' -%>
+  "${distro-id} ${distro-codename}-security";
+  "${distro-id} ${distro-codename}-lts";
+<% else -%>
+  # See Debian bug #704087
+  "o=Debian,a=oldstable,l=Debian-Security";
+  "o=Debian,a=stable,l=Debian-Security";
+<% end -%>
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
+<% if mailonlyonerror -%>
+Unattended-Upgrade::MailOnlyOnError "true";
+<% end -%>
-- 
cgit v1.2.3


From d24ca3314fadd7836ed0d6345359eb7ccfad6419 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 27 Jul 2013 13:42:54 -0400
Subject: Parametrize unattended-upgrades mail recipient

---
 manifests/unattended_upgrades.pp    | 1 +
 templates/50unattended-upgrades.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index b63b483..7e17333 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,6 +1,7 @@
 class apt::unattended_upgrades (
   $config_content = undef,
   $mailonlyonerror = true,
+  $mail_recipient = 'root',
 ) {
 
   package { 'unattended-upgrades':
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 0ba0d7e..41bac87 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -20,7 +20,7 @@ APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Download-Upgradeable-Packages "1";
 APT::Periodic::Unattended-Upgrade "1";
 
-Unattended-Upgrade::Mail "root";
+Unattended-Upgrade::Mail "<%= mail_recipient -%>";
 <% if mailonlyonerror -%>
 Unattended-Upgrade::MailOnlyOnError "true";
 <% end -%>
-- 
cgit v1.2.3


From 0389b1126164bf8e884f5951d734d725bc718a66 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 17 Apr 2015 16:42:22 -0400
Subject: unattended-upgrades: use an @ prefix for template variables

---
 templates/50unattended-upgrades.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 41bac87..318b69d 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -20,7 +20,7 @@ APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Download-Upgradeable-Packages "1";
 APT::Periodic::Unattended-Upgrade "1";
 
-Unattended-Upgrade::Mail "<%= mail_recipient -%>";
-<% if mailonlyonerror -%>
+Unattended-Upgrade::Mail "<%= @mail_recipient -%>";
+<% if @mailonlyonerror -%>
 Unattended-Upgrade::MailOnlyOnError "true";
 <% end -%>
-- 
cgit v1.2.3


From 6f6e725e60f05a232ba6053cfc49ce1b219be7c7 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 17 Apr 2015 16:43:26 -0400
Subject: Add parameter for blacklisting a list of packages.

This functionality was lost because we stopped using a source file for
the 50unattended-upgrades file that would previously let one override
the configuration per release or per host.
---
 README                              | 4 ++++
 manifests/unattended_upgrades.pp    | 1 +
 templates/50unattended-upgrades.erb | 8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/README b/README
index 87b303a..9cf17d1 100644
--- a/README
+++ b/README
@@ -17,6 +17,10 @@ Ubuntu support is lagging behind but not absent either.
 
 ! Upgrade Notice !
 
+ * If you were using custom 50unattended-upgrades.${::lsbdistcodename} in your
+   site_apt, these are no longer supported. You should migrate to passing
+   $blacklisted_packages to the apt::unattended_upgrades class.
+
  * the apt class has been moved to a paramterized class. if you were including
    this class before, after passing some variables, you will need to move to
    instantiating the class with those variables instead. For example, if you 
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 7e17333..9f74bbd 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -2,6 +2,7 @@ class apt::unattended_upgrades (
   $config_content = undef,
   $mailonlyonerror = true,
   $mail_recipient = 'root',
+  $blacklisted_packages = [],
 ) {
 
   package { 'unattended-upgrades':
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 318b69d..4492c2d 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -16,6 +16,14 @@ Unattended-Upgrade::Allowed-Origins {
 <% end -%>
 };
 
+<% if not @blacklisted_packages.empty?  -%>
+Unattended-Upgrade::Package-Blacklist {
+<% @blacklisted_packages.each do |pkg| -%>
+  "<%= pkg %>";
+<% end -%>
+}
+<% end -%>
+
 APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Download-Upgradeable-Packages "1";
 APT::Periodic::Unattended-Upgrade "1";
-- 
cgit v1.2.3


From 25af635994f793238bb2f227984c157d5d4c7ddf Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 17 Apr 2015 16:45:35 -0400
Subject: Document unattended_upgrades class parameters

---
 README | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README b/README
index 9cf17d1..5c13fc4 100644
--- a/README
+++ b/README
@@ -374,6 +374,17 @@ apt::unattended_upgrades
 If this class is included, it will install the package 'unattended-upgrades'
 and configure it to daily upgrade the system.
 
+The class has the following parameters that you can use to change the contents
+of the configuration file. The values shown here are the default values:
+
+ * $config_content = undef
+ * $mailonlyonerror = true
+ * $mail_recipient = 'root'
+ * $blacklisted_packages = []
+
+Note that using $config_content actually specifies all of the configuration
+contents and thus makes the other parameters useless.
+
 Defines
 =======
 
-- 
cgit v1.2.3


From 5532df22f12655ddb7f99f5eee2fe05e8c953444 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Tue, 28 Apr 2015 11:57:23 -0700
Subject: invert the backports logic because squeeze and older were the
 exception and wheezy and newer the default

---
 manifests/params.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 54fd13e..35fa44f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,8 +7,8 @@ class apt::params () {
   $debian_url = 'http://http.debian.net/debian/'
   $security_url = 'http://security.debian.org/'
   $backports_url = $::lsbdistcodename ? {
-    'wheezy' => $debian_url,
-    default  => 'http://backports.debian.org/debian-backports/',
+    'squeeze'  => 'http://backports.debian.org/debian-backports/',
+    default => $debian_url
   }
   $lts_url = $debian_url
   $volatile_url = 'http://volatile.debian.org/debian-volatile/'
-- 
cgit v1.2.3


From 3dac57374f63ca6f0565f46feb5970fade960c6b Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Tue, 28 Apr 2015 11:59:46 -0700
Subject: the http redirector has a new official home

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 35fa44f..f977c27 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,7 +4,7 @@ class apt::params () {
   $use_volatile = false
   $include_src = false
   $use_next_release = false
-  $debian_url = 'http://http.debian.net/debian/'
+  $debian_url = 'http://httpredir.debian.org/debian/'
   $security_url = 'http://security.debian.org/'
   $backports_url = $::lsbdistcodename ? {
     'squeeze'  => 'http://backports.debian.org/debian-backports/',
-- 
cgit v1.2.3


From 74db9ebf282b7ef4488ae8e6b82652d1a2e7eac1 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 6 May 2015 10:41:47 -0400
Subject: jessie has been released!

---
 lib/puppet/parser/functions/debian_nextcodename.rb    | 3 ++-
 lib/puppet/parser/functions/debian_release.rb         | 7 ++++---
 lib/puppet/parser/functions/debian_release_version.rb | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
index f3190ef..ee59612 100644
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ b/lib/puppet/parser/functions/debian_nextcodename.rb
@@ -3,7 +3,8 @@ module Puppet::Parser::Functions
     case args[0]
       when "squeeze" then "wheezy"
       when "wheezy"  then "jessie"
-      when "jessie"  then "sid"
+      when "jessie"  then "stretch"
+      when "stretch" then "sid"
       when "sid"     then "experimental"
       else "sid"
     end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
index d7b6718..3f24ad0 100644
--- a/lib/puppet/parser/functions/debian_release.rb
+++ b/lib/puppet/parser/functions/debian_release.rb
@@ -1,9 +1,10 @@
 module Puppet::Parser::Functions
   newfunction(:debian_release, :type => :rvalue) do |args|
     case args[0]
-      when 'squeeze'      then 'oldstable'
-      when 'wheezy'       then 'stable'
-      when 'jessie'       then 'testing'
+      when 'squeeze'      then 'oldoldstable'
+      when 'wheezy'       then 'oldstable'
+      when 'jessie'       then 'stable'
+      when 'stretch'      then 'testing'
       when 'sid'          then 'unstable'
       when 'experimental' then 'experimental'
       else 'testing'
diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb
index 0a57fd3..32cafcb 100644
--- a/lib/puppet/parser/functions/debian_release_version.rb
+++ b/lib/puppet/parser/functions/debian_release_version.rb
@@ -3,6 +3,9 @@ module Puppet::Parser::Functions
     case args[0]
       when 'squeeze'      then '6.0'
       when 'wheezy'       then '7.0'
+      when 'jessie'       then '8.0'
+      when 'stretch'      then '9.0'
+      when 'buster'       then '10.0'
       else ''
     end
   end
-- 
cgit v1.2.3


From f1a53bcfa7702f3bd1f86486d10b1f10cd0f2663 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 6 May 2015 13:31:07 -0400
Subject: Fix error in 50unattended-upgrades.erb syntax, remove lsb fact

---
 templates/50unattended-upgrades.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 4492c2d..94059d5 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -5,8 +5,7 @@ Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:${distro_codename}-security";
   "${distro_id}:${distro_codename}-updates";
   "${distro_id}:${distro_codename}-backports";
-<% else -%>
-<% if scope.lookupvar('::lsbdistcodename') == 'squeeze' -%>
+<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
   "${distro-id} ${distro-codename}-security";
   "${distro-id} ${distro-codename}-lts";
 <% else -%>
-- 
cgit v1.2.3


From a7cc68ed9965f665572afd9d279ebf5f3c7043d7 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 6 May 2015 15:52:07 -0400
Subject: add $ensure_version parameter, to allow for overriding which version
 of unattended-upgrades is installed

---
 manifests/unattended_upgrades.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 9f74bbd..28c6092 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -3,10 +3,11 @@ class apt::unattended_upgrades (
   $mailonlyonerror = true,
   $mail_recipient = 'root',
   $blacklisted_packages = [],
+  $ensure_version = present
 ) {
 
   package { 'unattended-upgrades':
-    ensure  => present
+    ensure  => $ensure_version
   }
 
   $file_content = $config_content ? {
-- 
cgit v1.2.3


From a4d788d778ad9b517c840c157d0c0119443c6ac9 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 6 May 2015 21:40:35 +0200
Subject: don't call Exec[refresh_apt] after deploying unattended-upgrades
 config

unattended-upgrades is run on a daily base by cron, no need to force
an `apt-get update` after changing this file.
---
 manifests/unattended_upgrades.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 28c6092..6cb0518 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -16,7 +16,8 @@ class apt::unattended_upgrades (
   }
 
   apt_conf { '50unattended-upgrades':
-    content => $file_content,
-    require => Package['unattended-upgrades'],
+    content     => $file_content,
+    require     => Package['unattended-upgrades'],
+    refresh_apt => false
   }
 }
-- 
cgit v1.2.3


From 90a51c3ef89689e0659574336db20f4a2d014f53 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 6 May 2015 17:14:53 -0400
Subject: Fix 50unattended-upgrades template for squeeze, better pattern for
 later release

---
 templates/50unattended-upgrades.erb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 94059d5..2bcfab0 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -1,17 +1,18 @@
 // this file is managed by puppet !
 
-Unattended-Upgrade::Allowed-Origins {
 <% if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
+Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:${distro_codename}-security";
   "${distro_id}:${distro_codename}-updates";
   "${distro_id}:${distro_codename}-backports";
 <% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
-  "${distro-id} ${distro-codename}-security";
-  "${distro-id} ${distro-codename}-lts";
+Unattended-Upgrade::Allowed-Origins {
+  "${distro-id}:oldoldstable";
+  "${distro-id}:squeeze-lts";
 <% else -%>
-  # See Debian bug #704087
-  "o=Debian,a=oldstable,l=Debian-Security";
-  "o=Debian,a=stable,l=Debian-Security";
+Unattended-Upgrade::Origins-Pattern {
+  "o=Debian,l=Debian-Security";
+  "o=Debian,a=${distro-id}-lts";
 <% end -%>
 };
 
-- 
cgit v1.2.3


From 07424069c2cb66c484e2bfe160a1aba2efd610ce Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 7 May 2015 12:52:25 -0400
Subject: Fix typos in unattended-upgrades template

---
 templates/50unattended-upgrades.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 2bcfab0..73ffa60 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -7,12 +7,12 @@ Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:${distro_codename}-backports";
 <% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
 Unattended-Upgrade::Allowed-Origins {
-  "${distro-id}:oldoldstable";
-  "${distro-id}:squeeze-lts";
+  "${distro_id}:oldoldstable";
+  "${distro_id}:squeeze-lts";
 <% else -%>
 Unattended-Upgrade::Origins-Pattern {
   "o=Debian,l=Debian-Security";
-  "o=Debian,a=${distro-id}-lts";
+  "o=Debian,a=${distro_id}-lts";
 <% end -%>
 };
 
@@ -21,7 +21,7 @@ Unattended-Upgrade::Package-Blacklist {
 <% @blacklisted_packages.each do |pkg| -%>
   "<%= pkg %>";
 <% end -%>
-}
+};
 <% end -%>
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From 95a68805a0ec1c175472f44b720c9f9ee7a57e45 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 7 May 2015 18:35:53 -0400
Subject: Add upgrade notice about updated functions

---
 README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README b/README
index 5c13fc4..8333be2 100644
--- a/README
+++ b/README
@@ -17,6 +17,10 @@ Ubuntu support is lagging behind but not absent either.
 
 ! Upgrade Notice !
 
+ * Several parser functions have been updated: you need to restart your puppet
+   master, otherwise some nodes may keep on using an old, cached version!
+   (https://docs.puppetlabs.com/guides/custom_functions.html#gotchas)
+
  * If you were using custom 50unattended-upgrades.${::lsbdistcodename} in your
    site_apt, these are no longer supported. You should migrate to passing
    $blacklisted_packages to the apt::unattended_upgrades class.
-- 
cgit v1.2.3


From ae4771b452332fdec335891cfed2c200b566d2f3 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 7 May 2015 18:37:24 -0400
Subject: Adjusted sources.list template: LTS is now 'oldoldstable'

---
 templates/Debian/sources.list.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 37f1c35..d043b70 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -43,7 +43,7 @@ deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
 
 <% if use_lts=scope.lookupvar('apt::use_lts') -%>
 # LTS
-<% if release != "oldstable" -%>
+<% if release != "oldoldstable" -%>
 # There is no LTS archive for <%= release %>
 <% else -%>
 deb <%= debian_url %> <%= codename %>-lts <%= lrepos %>
-- 
cgit v1.2.3


From 87bfb868d7625100086a26a81743f5adbabbb988 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 11 May 2015 09:55:26 -0400
Subject: Avoid unattended security upgrades from stable if running oldstable

---
 templates/50unattended-upgrades.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 73ffa60..23c5c89 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -11,8 +11,8 @@ Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:squeeze-lts";
 <% else -%>
 Unattended-Upgrade::Origins-Pattern {
-  "o=Debian,l=Debian-Security";
-  "o=Debian,a=${distro_id}-lts";
+  "origin=Debian,archive=<%= scope.lookupvar('::apt::release') %>,label=Debian-Security";
+  "origin=Debian,archive=${distro_codename}-lts";
 <% end -%>
 };
 
-- 
cgit v1.2.3


From d007a403330c553d925b1b4888d93962a5f83f99 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 11 May 2015 10:49:27 -0400
Subject: Replace debian_*() parser functions with facts

* Removes dependency on lsb-release and/or Facter >1.7
    (values are based on $::lsbdistcodename, when available)
* Simplifies maintenance: only lib/facter/util/* require updates as new
  releases are made

Caveats:
* apt::codename is removed; to override debian_* facts, set the
  FACTER_debian_codename environment variable for puppet
* If tracking unstable, make sure lsb-release is installed, as other
  methods can't tell between testing and unstable
---
 README                                             | 22 +++++-------
 lib/facter/debian_codename.rb                      | 40 ++++++++++++++++++++++
 lib/facter/debian_lts.rb                           | 14 ++++++++
 lib/facter/debian_nextcodename.rb                  | 22 ++++++++++++
 lib/facter/debian_nextrelease.rb                   | 23 +++++++++++++
 lib/facter/debian_release.rb                       | 36 +++++++++++++++++++
 lib/facter/ubuntu_codename.rb                      |  8 +++++
 lib/facter/ubuntu_nextcodename.rb                  | 18 ++++++++++
 lib/facter/util/debian.rb                          | 18 ++++++++++
 lib/facter/util/ubuntu.rb                          | 20 +++++++++++
 lib/puppet/parser/functions/debian_nextcodename.rb | 12 -------
 lib/puppet/parser/functions/debian_nextrelease.rb  | 11 ------
 lib/puppet/parser/functions/debian_release.rb      | 13 -------
 .../parser/functions/debian_release_version.rb     | 12 -------
 manifests/apticron.pp                              |  2 +-
 manifests/init.pp                                  | 16 ---------
 manifests/listchanges.pp                           |  2 +-
 manifests/params.pp                                |  3 +-
 manifests/preferences.pp                           |  4 +--
 manifests/preseeded_package.pp                     |  2 +-
 templates/50unattended-upgrades.erb                |  4 +--
 templates/Debian/preferences_jessie.erb            |  2 +-
 templates/Debian/preferences_lenny.erb             |  6 ++--
 templates/Debian/preferences_squeeze.erb           |  4 +--
 templates/Debian/preferences_wheezy.erb            |  2 +-
 templates/Debian/sources.list.erb                  |  8 ++---
 templates/Ubuntu/preferences_maverick.erb          |  4 +--
 templates/Ubuntu/sources.list.erb                  |  2 +-
 28 files changed, 229 insertions(+), 101 deletions(-)
 create mode 100644 lib/facter/debian_codename.rb
 create mode 100644 lib/facter/debian_lts.rb
 create mode 100644 lib/facter/debian_nextcodename.rb
 create mode 100644 lib/facter/debian_nextrelease.rb
 create mode 100644 lib/facter/debian_release.rb
 create mode 100644 lib/facter/ubuntu_codename.rb
 create mode 100644 lib/facter/ubuntu_nextcodename.rb
 create mode 100644 lib/facter/util/debian.rb
 create mode 100644 lib/facter/util/ubuntu.rb
 delete mode 100644 lib/puppet/parser/functions/debian_nextcodename.rb
 delete mode 100644 lib/puppet/parser/functions/debian_nextrelease.rb
 delete mode 100644 lib/puppet/parser/functions/debian_release.rb
 delete mode 100644 lib/puppet/parser/functions/debian_release_version.rb

diff --git a/README b/README
index 8333be2..e554837 100644
--- a/README
+++ b/README
@@ -17,9 +17,11 @@ Ubuntu support is lagging behind but not absent either.
 
 ! Upgrade Notice !
 
- * Several parser functions have been updated: you need to restart your puppet
-   master, otherwise some nodes may keep on using an old, cached version!
-   (https://docs.puppetlabs.com/guides/custom_functions.html#gotchas)
+ * The apt::codename parameter has been removed. In its place, the
+   debian_codename fact may be overridden via an environment variable. This
+   will affect all other debian_* facts, and achieve the same result.
+
+     FACTER_debian_codename=jessie puppet agent -t
 
  * If you were using custom 50unattended-upgrades.${::lsbdistcodename} in your
    site_apt, these are no longer supported. You should migrate to passing
@@ -97,8 +99,9 @@ Requirements
 
 This module needs:
 
-- the lsb module: git://labs.riseup.net/shared-lsb
-- the common module: git://labs.riseup.net/shared-common
+- the common module: https://gitlab.com/shared-puppet-modules-group/common
+- the lsb module: https://gitlab.com/shared-puppet-modules-group/lsb
+  (optional but recommended, required on Ubuntu)
 
 By default, on normal hosts, this module sets the configuration option
 DSelect::Clean to 'auto'. On virtual servers, the value is set by default to
@@ -225,15 +228,6 @@ Class parameters:
 
   class { 'apt': custom_sources_list => template('site_apt/sources.list') }
 
-* codename
-
-  Contains the codename ("squeeze", "wheezy", ...) of the client's release. While
-  these values come from lsb-release by default, this parameter can be set
-  manually, e.g. to enable forced upgrades. For example:
-
-     include apt::dist_upgrade
-     class { 'apt': codename => 'wheezy', notify => Exec['apt_dist-upgrade'] }
-
 * custom_key_dir
 
   If you have different apt-key files that you want to get added to your
diff --git a/lib/facter/debian_codename.rb b/lib/facter/debian_codename.rb
new file mode 100644
index 0000000..73eeea2
--- /dev/null
+++ b/lib/facter/debian_codename.rb
@@ -0,0 +1,40 @@
+begin
+  require 'facter/util/debian'
+end
+
+def version_to_codename(version)
+  if Facter::Util::Debian::CODENAMES.has_key?(version)
+    return Facter::Util::Debian::CODENAMES[version]
+  else
+    Facter.warn("Could not determine codename from version '#{version}'")
+  end
+end
+
+Facter.add(:debian_codename) do
+  has_weight 99
+  confine :operatingsystem => 'Debian'
+  setcode do
+    Facter.value('lsbdistcodename')
+  end
+end
+
+Facter.add(:debian_codename) do
+  has_weight 66
+  confine :operatingsystem => 'Debian'
+  setcode do
+    version_to_codename(Facter.value('operatingsystemmajrelease'))
+  end
+end
+
+Facter.add(:debian_codename) do
+  has_weight 33
+  confine :operatingsystem => 'Debian'
+  setcode do
+    debian_version = File.open('/etc/debian_version', &:readline)
+    if debian_version.match(/^\d+/)
+      version_to_codename(version_to_codename.scan(/^(\d+)/)[0][0])
+    elsif debian_version.match(/^[a-z]+\/(sid|unstable)/)
+      debian_version.scan(/^([a-z]+)\//)[0][0]
+    end
+  end
+end
diff --git a/lib/facter/debian_lts.rb b/lib/facter/debian_lts.rb
new file mode 100644
index 0000000..1c137e1
--- /dev/null
+++ b/lib/facter/debian_lts.rb
@@ -0,0 +1,14 @@
+begin
+  require 'facter/util/debian'
+end
+
+Facter.add(:debian_lts) do
+  confine :operatingsystem => 'Debian'
+  setcode do
+    if Facter::Util::Debian::LTS.include? Facter.value('debian_codename')
+      true
+    else
+      false
+    end
+  end
+end
diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb
new file mode 100644
index 0000000..755a0e5
--- /dev/null
+++ b/lib/facter/debian_nextcodename.rb
@@ -0,0 +1,22 @@
+begin
+  require 'facter/util/debian'
+end
+
+def debian_codename_to_next(codename)
+  if codename == "sid"
+    return "experimental"
+  else
+    codenames = Facter::Util::Debian::CODENAMES.values.reverse
+    i = codenames.index(codename)
+    if i and i+1 < codenames.count
+      return codenames[i+1]
+    end
+  end
+end
+
+Facter.add(:debian_nextcodename) do
+  confine :operatingsystem => 'Debian'
+  setcode do
+    debian_codename_to_next(Facter.value('debian_codename'))
+  end
+end
diff --git a/lib/facter/debian_nextrelease.rb b/lib/facter/debian_nextrelease.rb
new file mode 100644
index 0000000..2a9c4f5
--- /dev/null
+++ b/lib/facter/debian_nextrelease.rb
@@ -0,0 +1,23 @@
+def debian_release_to_next(release)
+  releases = [
+    'oldoldoldstable',
+    'oldoldstable',
+    'oldstable',
+    'stable',
+    'testing',
+    'unstable',
+    'experimental',
+  ]
+  if releases.include? release
+    if releases.index(release)+1 < releases.count
+      return releases[releases.index(release)+1]
+    end
+  end
+end
+
+Facter.add(:debian_nextrelease) do
+  confine :operatingsystem => 'Debian'
+  setcode do
+    debian_release_to_next(Facter.value('debian_release'))
+  end
+end
diff --git a/lib/facter/debian_release.rb b/lib/facter/debian_release.rb
new file mode 100644
index 0000000..09e8eef
--- /dev/null
+++ b/lib/facter/debian_release.rb
@@ -0,0 +1,36 @@
+begin
+  require 'facter/util/debian'
+end
+
+def debian_codename_to_release(codename)
+  stable = Facter::Util::Debian::STABLE
+  versions = Facter::Util::Debian::CODENAMES.invert
+  release = nil
+  if codename == "sid"
+    release = "unstable"
+  elsif versions.has_key? codename
+    version = versions[codename].to_i
+    if version == stable
+      release = "stable"
+    elsif version < stable
+      release = "stable"
+      for i in version..stable - 1
+        release = "old" + release
+      end
+    elsif version == stable + 1
+      release = "testing"
+    end
+  end
+  if release.nil?
+    Facter.warn("Could not determine release from codename #{codename}!")
+  end
+  return release
+end
+
+Facter.add(:debian_release) do
+  has_weight 99
+  confine :operatingsystem => 'Debian'
+  setcode do
+    debian_codename_to_release(Facter.value('debian_codename'))
+  end
+end
diff --git a/lib/facter/ubuntu_codename.rb b/lib/facter/ubuntu_codename.rb
new file mode 100644
index 0000000..814fd94
--- /dev/null
+++ b/lib/facter/ubuntu_codename.rb
@@ -0,0 +1,8 @@
+Facter.add(:ubuntu_codename) do
+  confine :operatingsystem => 'Ubuntu'
+  setcode do
+    Facter.value('lsbdistcodename')
+  end
+end
+
+
diff --git a/lib/facter/ubuntu_nextcodename.rb b/lib/facter/ubuntu_nextcodename.rb
new file mode 100644
index 0000000..38b64ad
--- /dev/null
+++ b/lib/facter/ubuntu_nextcodename.rb
@@ -0,0 +1,18 @@
+begin
+  require 'facter/util/ubuntu'
+end
+
+def ubuntu_codename_to_next(codename)
+  codenames = Facter::Util::Ubuntu::CODENAMES
+  i = codenames.index(codename)
+  if i and i+1 < codenames.count
+    return codenames[i+1]
+  end
+end
+
+Facter.add(:ubuntu_nextcodename) do
+  confine :operatingsystem => 'Ubuntu'
+  setcode do
+    ubuntu_codename_to_next(Facter.value('ubuntu_codename'))
+  end
+end
diff --git a/lib/facter/util/debian.rb b/lib/facter/util/debian.rb
new file mode 100644
index 0000000..290c17b
--- /dev/null
+++ b/lib/facter/util/debian.rb
@@ -0,0 +1,18 @@
+module Facter
+  module Util
+    module Debian
+      STABLE = 8
+      CODENAMES = {
+        "5" => "lenny",
+        "6" => "squeeze",
+        "7" => "wheezy",
+        "8" => "jessie",
+        "9" => "stretch",
+        "10" => "buster",
+      }
+      LTS = [
+        "squeeze",
+      ]
+    end
+  end
+end
diff --git a/lib/facter/util/ubuntu.rb b/lib/facter/util/ubuntu.rb
new file mode 100644
index 0000000..1b2411a
--- /dev/null
+++ b/lib/facter/util/ubuntu.rb
@@ -0,0 +1,20 @@
+module Facter
+  module Util
+    module Ubuntu
+      CODENAMES = [
+        "lucid",
+        "maverick",
+        "natty",
+        "oneiric",
+        "precise",
+        "quantal",
+        "raring",
+        "saucy",
+        "trusty",
+        "utopic",
+        "vivid",
+        "wily",
+      ]
+    end
+  end
+end
diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
deleted file mode 100644
index ee59612..0000000
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:debian_nextcodename, :type => :rvalue) do |args|
-    case args[0]
-      when "squeeze" then "wheezy"
-      when "wheezy"  then "jessie"
-      when "jessie"  then "stretch"
-      when "stretch" then "sid"
-      when "sid"     then "experimental"
-      else "sid"
-    end
-  end
-end
diff --git a/lib/puppet/parser/functions/debian_nextrelease.rb b/lib/puppet/parser/functions/debian_nextrelease.rb
deleted file mode 100644
index 76c3e0d..0000000
--- a/lib/puppet/parser/functions/debian_nextrelease.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:debian_nextrelease, :type => :rvalue) do |args|
-    case args[0]
-      when 'oldstable' then 'stable'
-      when 'stable'    then 'testing'
-      when 'testing'   then 'unstable'
-      when 'unstable'  then 'experimental'
-      else 'unstable'
-    end
-  end
-end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
deleted file mode 100644
index 3f24ad0..0000000
--- a/lib/puppet/parser/functions/debian_release.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:debian_release, :type => :rvalue) do |args|
-    case args[0]
-      when 'squeeze'      then 'oldoldstable'
-      when 'wheezy'       then 'oldstable'
-      when 'jessie'       then 'stable'
-      when 'stretch'      then 'testing'
-      when 'sid'          then 'unstable'
-      when 'experimental' then 'experimental'
-      else 'testing'
-    end
-  end
-end
diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb
deleted file mode 100644
index 32cafcb..0000000
--- a/lib/puppet/parser/functions/debian_release_version.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:debian_release_version, :type => :rvalue) do |args|
-    case args[0]
-      when 'squeeze'      then '6.0'
-      when 'wheezy'       then '7.0'
-      when 'jessie'       then '8.0'
-      when 'stretch'      then '9.0'
-      when 'buster'       then '10.0'
-      else ''
-    end
-  end
-end
diff --git a/manifests/apticron.pp b/manifests/apticron.pp
index 54d7b71..9c94f9c 100644
--- a/manifests/apticron.pp
+++ b/manifests/apticron.pp
@@ -1,6 +1,6 @@
 class apt::apticron(
   $ensure_version = 'installed',
-  $config = "apt/${::operatingsystem}/apticron_${::lsbdistcodename}.erb",
+  $config = "apt/${::operatingsystem}/apticron_${::debian_codename}.erb",
   $email = 'root',
   $diff_only = '1',
   $listchanges_profile = 'apticron',
diff --git a/manifests/init.pp b/manifests/init.pp
index 68856cc..5aaa13a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,7 +4,6 @@
 # See LICENSE for the full license granted to you.
 
 class apt(
-  $codename = $apt::params::codename,
   $use_lts = $apt::params::use_lts,
   $use_volatile = $apt::params::use_volatile,
   $include_src = $apt::params::include_src,
@@ -41,21 +40,6 @@ class apt(
     require => undef,
   }
 
-  include lsb
-
-  # init $release, $next_release, $next_codename, $release_version
-  case $codename {
-    'n/a': {
-      fail("Unknown lsbdistcodename reported by facter: '$::lsbdistcodename', please fix this by setting this variable in your manifest.")
-    }
-    default: {
-      $release = debian_release($codename)
-    }
-  }
-  $release_version = debian_release_version($codename)
-  $next_codename = debian_nextcodename($codename)
-  $next_release = debian_nextrelease($release)
-
   $sources_content = $custom_sources_list ? {
     ''      => template( "apt/${::operatingsystem}/sources.list.erb"),
     default => $custom_sources_list
diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index 0c163ae..e64bb1b 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,6 +1,6 @@
 class apt::listchanges(
   $ensure_version = 'installed',
-  $config = "apt/${::operatingsystem}/listchanges_${::lsbdistcodename}.erb",
+  $config = "apt/${::operatingsystem}/listchanges_${::debian_codename}.erb",
   $frontend = 'mail',
   $email = 'root',
   $confirm = '0',
diff --git a/manifests/params.pp b/manifests/params.pp
index f977c27..da531db 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,12 +1,11 @@
 class apt::params () {
-  $codename = $::lsbdistcodename
   $use_lts = false
   $use_volatile = false
   $include_src = false
   $use_next_release = false
   $debian_url = 'http://httpredir.debian.org/debian/'
   $security_url = 'http://security.debian.org/'
-  $backports_url = $::lsbdistcodename ? {
+  $backports_url = $::debian_codename ? {
     'squeeze'  => 'http://backports.debian.org/debian-backports/',
     default => $debian_url
   }
diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 9ed24c1..6982ca0 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -2,8 +2,8 @@ class apt::preferences {
 
   $pref_contents = $apt::custom_preferences ? {
     ''      => $::operatingsystem ? {
-      'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
-      'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
+      'debian' => template("apt/${::operatingsystem}/preferences_${::debian_codename}.erb"),
+      'ubuntu' => template("apt/${::operatingsystem}/preferences_${::ubuntu_codename}.erb"),
     },
     default => $apt::custom_preferences
   }
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 9bca8b1..3ef0687 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -4,7 +4,7 @@ define apt::preseeded_package (
 ) {
   $seedfile = "/var/cache/local/preseeding/${name}.seeds"
   $real_content = $content ? {
-    ''      => template ( "site_apt/${::lsbdistcodename}/${name}.seeds" ),
+    ''      => template ( "site_apt/${::debian_codename}/${name}.seeds" ),
     default => $content
   }
 
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 23c5c89..2afebfe 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -5,13 +5,13 @@ Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:${distro_codename}-security";
   "${distro_id}:${distro_codename}-updates";
   "${distro_id}:${distro_codename}-backports";
-<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
+<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::debian_codename') == 'squeeze' -%>
 Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:oldoldstable";
   "${distro_id}:squeeze-lts";
 <% else -%>
 Unattended-Upgrade::Origins-Pattern {
-  "origin=Debian,archive=<%= scope.lookupvar('::apt::release') %>,label=Debian-Security";
+  "origin=Debian,archive=<%= scope.lookupvar('::debian_release') %>,label=Debian-Security";
   "origin=Debian,archive=${distro_codename}-lts";
 <% end -%>
 };
diff --git a/templates/Debian/preferences_jessie.erb b/templates/Debian/preferences_jessie.erb
index 4f8e95c..0888abe 100644
--- a/templates/Debian/preferences_jessie.erb
+++ b/templates/Debian/preferences_jessie.erb
@@ -1,4 +1,4 @@
-Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %>
+Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
 Package: *
 Pin: release o=Debian,n=<%= codename %>
 Pin-Priority: 990
diff --git a/templates/Debian/preferences_lenny.erb b/templates/Debian/preferences_lenny.erb
index 5c3c829..6500168 100644
--- a/templates/Debian/preferences_lenny.erb
+++ b/templates/Debian/preferences_lenny.erb
@@ -1,6 +1,6 @@
-Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %>
+Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
 Package: *
-Pin: release o=Debian,a=<%= scope.lookupvar('apt::release') %>,v=<%= scope.lookupvar('apt::release_version') %>*
+Pin: release o=Debian,a=<%= scope.lookupvar('::debian_release') %>,v=5*
 Pin-Priority: 990
 
 Explanation: Debian backports
@@ -8,7 +8,7 @@ Package: *
 Pin: origin backports.debian.org
 Pin-Priority: 200
 
-Explanation: Debian <%= next_release=scope.lookupvar('apt::next_release') %>
+Explanation: Debian <%= next_release=scope.lookupvar('::debian_nextrelease') %>
 Package: *
 Pin: release o=Debian,a=<%= next_release %>
 Pin-Priority: 2
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb
index 838b3a1..885edc7 100644
--- a/templates/Debian/preferences_squeeze.erb
+++ b/templates/Debian/preferences_squeeze.erb
@@ -1,4 +1,4 @@
-Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %>
+Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
 Package: *
 Pin: release o=Debian,n=<%= codename %>
 Pin-Priority: 990
@@ -13,7 +13,7 @@ Package: *
 Pin: release o=Debian,n=<%= codename %>-lts
 Pin-Priority: 990
 
-Explanation: Debian <%= next_codename=scope.lookupvar('apt::next_codename') %>
+Explanation: Debian <%= next_codename=scope.lookupvar('::debian_nextcodename') %>
 Package: *
 Pin: release o=Debian,n=<%= next_codename %>
 Pin-Priority: 2
diff --git a/templates/Debian/preferences_wheezy.erb b/templates/Debian/preferences_wheezy.erb
index 0cc0e5c..106108d 100644
--- a/templates/Debian/preferences_wheezy.erb
+++ b/templates/Debian/preferences_wheezy.erb
@@ -1,4 +1,4 @@
-Explanation: Debian <%= codename=scope.lookupvar('apt::codename') %>
+Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
 Package: *
 Pin: release o=Debian,n=<%= codename %>
 Pin-Priority: 990
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index d043b70..8629626 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -1,7 +1,7 @@
 # This file is managed by puppet
 # all local modifications will be overwritten
 
-### Debian current: <%= codename=scope.lookupvar('apt::codename') %>
+### Debian current: <%= codename=scope.lookupvar('::debian_codename') %>
 
 # basic
 deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
@@ -10,7 +10,7 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 <% end -%>
 
 # security
-<% if ((release=scope.lookupvar('apt::release')) == "stable" || release == "oldstable") -%>
+<% if ((release=scope.lookupvar('::debian_release')) == "stable" || release == "oldstable") -%>
 deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %>
 <%   if include_src -%>
 deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
@@ -43,7 +43,7 @@ deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
 
 <% if use_lts=scope.lookupvar('apt::use_lts') -%>
 # LTS
-<% if release != "oldoldstable" -%>
+<% if release_lts=scope.lookupvar('::debian_lts') == "false" -%>
 # There is no LTS archive for <%= release %>
 <% else -%>
 deb <%= debian_url %> <%= codename %>-lts <%= lrepos %>
@@ -54,7 +54,7 @@ deb-src <%= debian_url %> <%= codename %>-lts <%= lrepos %>
 <% end -%>
 
 <% if next_release=scope.lookupvar('apt::use_next_release') -%>
-### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %>
+### Debian next: <%= next_release=scope.lookupvar('::debian_nextrelease') ; next_codename=scope.lookupvar('::debian_nextcodename') %>
 
 # basic
 deb <%= debian_url %> <%= next_codename %> <%= lrepos %>
diff --git a/templates/Ubuntu/preferences_maverick.erb b/templates/Ubuntu/preferences_maverick.erb
index 801ddd4..8e5481d 100644
--- a/templates/Ubuntu/preferences_maverick.erb
+++ b/templates/Ubuntu/preferences_maverick.erb
@@ -1,4 +1,4 @@
-Explanation: Ubuntu <%= codename=scope.lookupvar('apt::codename') %> security
+Explanation: Ubuntu <%= codename=scope.lookupvar('::ubuntu_codename') %> security
 Package: *
 Pin: release o=Ubuntu,a=<%= codename %>-security
 Pin-Priority: 990
@@ -18,7 +18,7 @@ Package: *
 Pin: release a=<%= codename %>-backports
 Pin-Priority: 200
 
-Explanation: Ubuntu <%= next_release=scope.lookupvar('apt::next_release') %>
+Explanation: Ubuntu <%= next_release=scope.lookupvar('::ubuntu_nextcodename') %>
 Package: *
 Pin: release o=Ubuntu,a=<%= next_release %>
 Pin-Priority: 2
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index 8d2585d..e68399b 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -1,7 +1,7 @@
 # This file is managed by puppet
 # all local modifications will be overwritten
 
-# basic <%= codename=scope.lookupvar('apt::codename') %>
+# basic <%= codename=scope.lookupvar('::ubuntu_codename') %>
 deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
 <% if include_src=scope.lookupvar('apt::include_src') -%>
 deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %>
-- 
cgit v1.2.3


From 3a7dd605e344cd8bdfa33a1fb82bfefe948cbd00 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 3 Jun 2015 16:20:36 -0400
Subject: Fix bug with debian_nextcodename

---
 lib/facter/debian_nextcodename.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb
index 755a0e5..af16cc8 100644
--- a/lib/facter/debian_nextcodename.rb
+++ b/lib/facter/debian_nextcodename.rb
@@ -6,7 +6,7 @@ def debian_codename_to_next(codename)
   if codename == "sid"
     return "experimental"
   else
-    codenames = Facter::Util::Debian::CODENAMES.values.reverse
+    codenames = Facter::Util::Debian::CODENAMES.values
     i = codenames.index(codename)
     if i and i+1 < codenames.count
       return codenames[i+1]
-- 
cgit v1.2.3


From 5ea69cb0390deac15d57aefc361a895a0c9a6e96 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Tue, 9 Jun 2015 11:25:34 -0400
Subject: allow possibility of disabling backports

---
 manifests/init.pp                 |  1 +
 manifests/params.pp               |  1 +
 templates/Debian/sources.list.erb | 10 ++++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 68856cc..062be4c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,6 +7,7 @@ class apt(
   $codename = $apt::params::codename,
   $use_lts = $apt::params::use_lts,
   $use_volatile = $apt::params::use_volatile,
+  $use_backports = $apt::params::use_backports,
   $include_src = $apt::params::include_src,
   $use_next_release = $apt::params::use_next_release,
   $debian_url = $apt::params::debian_url,
diff --git a/manifests/params.pp b/manifests/params.pp
index f977c27..a1c7392 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -2,6 +2,7 @@ class apt::params () {
   $codename = $::lsbdistcodename
   $use_lts = false
   $use_volatile = false
+  $use_backports = true
   $include_src = false
   $use_next_release = false
   $debian_url = 'http://httpredir.debian.org/debian/'
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index d043b70..a19893d 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -19,14 +19,16 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
 # There is no security support for <%= release %>
 <% end -%>
 
+<% if use_volatile=scope.lookupvar('apt::use_backports') -%>
 # backports
-<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
+<%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no backports archive for <%= release %>
-<% else -%>
+<%   else -%>
 deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %>
-<%   if include_src -%>
+<%     if include_src -%>
 deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
-<%   end
+<%     end
+     end
    end -%>
 
 <% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
-- 
cgit v1.2.3


From dbee5c9487c8d06f27f1a3bb17f70bf870490258 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Tue, 9 Jun 2015 11:28:54 -0400
Subject: typo

---
 templates/Debian/sources.list.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index a19893d..ce43135 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -19,7 +19,7 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
 # There is no security support for <%= release %>
 <% end -%>
 
-<% if use_volatile=scope.lookupvar('apt::use_backports') -%>
+<% if use_backports=scope.lookupvar('apt::use_backports') -%>
 # backports
 <%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no backports archive for <%= release %>
-- 
cgit v1.2.3


From 3da1db27075082603a862c8fd5c3c1396e062bc8 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Tue, 9 Jun 2015 11:34:51 -0400
Subject: also control backports on ubuntu

---
 templates/Ubuntu/sources.list.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index 8d2585d..f3ef37c 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -19,8 +19,10 @@ deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
 deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
 <% end -%>
 
+<% if use_backports=scope.lookupvar('apt::use_backports') -%>
 # backports
 deb <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<% end -%>
+<%   end
+   end -%>
-- 
cgit v1.2.3


From d87876a16fdf6cb710210b1a11572d553dec755a Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Tue, 9 Jun 2015 11:35:41 -0400
Subject: also disable volatile on ubuntu if relevant

---
 templates/Ubuntu/sources.list.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index f3ef37c..213f051 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -7,11 +7,13 @@ deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lre
 deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %>
 <% end -%>
 
+<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
 # updates
 deb <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% end -%>
+<%   end
+   end -%>
 
 # security suppport
 deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
-- 
cgit v1.2.3


From 33acc00e5c6d8ab18f2992cccc8ee036b4d7771d Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Thu, 11 Jun 2015 10:07:47 -0400
Subject: add apt::key resource to deploy arbitrary keys

the rationale of this is that isn't useful for third party modules,
because they cannot inject keys in there without some serious apt
class hijacking
---
 README           | 17 +++++++++++++++++
 manifests/key.pp | 13 +++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 manifests/key.pp

diff --git a/README b/README
index 8333be2..835db79 100644
--- a/README
+++ b/README
@@ -478,6 +478,23 @@ Example:
                 'puppet:///modules/site_apt/company_internals.list' ],
   }
 
+apt::key
+--------
+
+Deploys a secure apt OpenPGP key. This usually accompanies the
+sources.list snippets above for third party repositories. For example,
+you would do:
+
+  apt::key { 'neurodebian.key':
+    source => 'puppet:///modules/site_apt/neurodebian.key',
+  }
+
+This deploys the key in the `${apt_base_dir}/keys` directory (as
+opposed to `$custom_key_dir` which deploys it in `keys.d`). The reason
+this exists on top of `$custom_key_dir` is to allow a more
+decentralised distribution of those keys, without having all modules
+throw their keys in the same directory in the manifests.
+
 apt::upgrade_package
 --------------------
 
diff --git a/manifests/key.pp b/manifests/key.pp
new file mode 100644
index 0000000..0ef9721
--- /dev/null
+++ b/manifests/key.pp
@@ -0,0 +1,13 @@
+define apt::key ($source) {
+  file {
+    "${apt::apt_base_dir}/${name}":
+      source  => $source;
+    "${apt::apt_base_dir}/keys":
+      ensure  => directory;
+  }
+  exec { "apt-key add ${apt::apt_base_dir}/${name}":
+    subscribe   => File["${apt::apt_base_dir}/${name}"],
+    refreshonly => true,
+    notify      => Exec['refresh_apt'],
+  }
+}
-- 
cgit v1.2.3


From 891aa0fbbed87e24322da7d3a80514f1bf94f0ac Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Thu, 11 Jun 2015 10:21:56 -0400
Subject: allow for binary keys that can be removed

---
 README                 | 25 +++++++++++++++++++++++--
 manifests/key.pp       | 15 +++++----------
 manifests/key/plain.pp | 13 +++++++++++++
 3 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 manifests/key/plain.pp

diff --git a/README b/README
index 835db79..d2cb71b 100644
--- a/README
+++ b/README
@@ -485,8 +485,25 @@ Deploys a secure apt OpenPGP key. This usually accompanies the
 sources.list snippets above for third party repositories. For example,
 you would do:
 
-  apt::key { 'neurodebian.key':
-    source => 'puppet:///modules/site_apt/neurodebian.key',
+  apt::key { 'neurodebian.gpg':
+    ensure => present,
+    source => 'puppet:///modules/site_apt/neurodebian.gpg',
+  }
+
+This deploys the key in the `/etc/apt/trusted.gpg.d` directory, which
+is assumed by secure apt to be binary OpenPGP keys and *not*
+"ascii-armored" or "plain text" OpenPGP key material. For the latter,
+use `apt::key::plain`.
+
+apt::key::plain
+---------------
+
+Deploys a secure apt OpenPGP key. This usually accompanies the
+sources.list snippets above for third party repositories. For example,
+you would do:
+
+  apt::key::asc { 'neurodebian.asc':
+    source => 'puppet:///modules/site_apt/neurodebian.asc',
   }
 
 This deploys the key in the `${apt_base_dir}/keys` directory (as
@@ -495,6 +512,10 @@ this exists on top of `$custom_key_dir` is to allow a more
 decentralised distribution of those keys, without having all modules
 throw their keys in the same directory in the manifests.
 
+Note that this model does *not* currently allow keys to be removed!
+Use `apt::key` instead for a more practical, revokable approach, but
+that needs binary keys.
+
 apt::upgrade_package
 --------------------
 
diff --git a/manifests/key.pp b/manifests/key.pp
index 0ef9721..3f9660f 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -1,13 +1,8 @@
-define apt::key ($source) {
+define apt::key ($ensure => 'present', $source) {
   file {
-    "${apt::apt_base_dir}/${name}":
-      source  => $source;
-    "${apt::apt_base_dir}/keys":
-      ensure  => directory;
-  }
-  exec { "apt-key add ${apt::apt_base_dir}/${name}":
-    subscribe   => File["${apt::apt_base_dir}/${name}"],
-    refreshonly => true,
-    notify      => Exec['refresh_apt'],
+    "/etc/apt/trusted.gpg.d/$name":
+      source => $source,
+      ensure => $ensure,
+      notify => Exec['refresh_apt'],
   }
 }
diff --git a/manifests/key/plain.pp b/manifests/key/plain.pp
new file mode 100644
index 0000000..a84e6dd
--- /dev/null
+++ b/manifests/key/plain.pp
@@ -0,0 +1,13 @@
+define apt::key::plain ($source) {
+  file {
+    "${apt::apt_base_dir}/${name}":
+      source  => $source;
+    "${apt::apt_base_dir}/keys":
+      ensure  => directory;
+  }
+  exec { "apt-key add ${apt::apt_base_dir}/${name}":
+    subscribe   => File["${apt::apt_base_dir}/${name}"],
+    refreshonly => true,
+    notify      => Exec['refresh_apt'],
+  }
+}
-- 
cgit v1.2.3


From 931076f85488e1b0f57aeaf67357a2443b18ffba Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Thu, 11 Jun 2015 10:32:40 -0400
Subject: fix typo

---
 manifests/key.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/key.pp b/manifests/key.pp
index 3f9660f..b396c1e 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -1,4 +1,4 @@
-define apt::key ($ensure => 'present', $source) {
+define apt::key ($ensure = 'present', $source) {
   file {
     "/etc/apt/trusted.gpg.d/$name":
       source => $source,
-- 
cgit v1.2.3


From ae0570dee6b46081c1e58d0f3cb2263caf55d667 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Wed, 26 Aug 2015 23:25:16 -0400
Subject: fix typo

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index d2cb71b..bcec047 100644
--- a/README
+++ b/README
@@ -502,7 +502,7 @@ Deploys a secure apt OpenPGP key. This usually accompanies the
 sources.list snippets above for third party repositories. For example,
 you would do:
 
-  apt::key::asc { 'neurodebian.asc':
+  apt::key::plain { 'neurodebian.asc':
     source => 'puppet:///modules/site_apt/neurodebian.asc',
   }
 
-- 
cgit v1.2.3


From 5564b3fba3d8aebdc3cbcd7441e9c7a216243f46 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Wed, 26 Aug 2015 23:27:58 -0400
Subject: fix install location of apt::key::plain

---
 manifests/key/plain.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/key/plain.pp b/manifests/key/plain.pp
index a84e6dd..a24a51b 100644
--- a/manifests/key/plain.pp
+++ b/manifests/key/plain.pp
@@ -1,12 +1,12 @@
 define apt::key::plain ($source) {
   file {
-    "${apt::apt_base_dir}/${name}":
+    "${apt::apt_base_dir}/keys/${name}":
       source  => $source;
     "${apt::apt_base_dir}/keys":
       ensure  => directory;
   }
-  exec { "apt-key add ${apt::apt_base_dir}/${name}":
-    subscribe   => File["${apt::apt_base_dir}/${name}"],
+  exec { "apt-key add ${apt::apt_base_dir}/keys/${name}":
+    subscribe   => File["${apt::apt_base_dir}/keys/${name}"],
     refreshonly => true,
     notify      => Exec['refresh_apt'],
   }
-- 
cgit v1.2.3


From 544796e0502e1377fc374bc9092a0ae8d8392be0 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Wed, 26 Aug 2015 23:29:11 -0400
Subject: document the .gpg extension requirement

---
 README | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README b/README
index bcec047..85cf6df 100644
--- a/README
+++ b/README
@@ -495,6 +495,8 @@ is assumed by secure apt to be binary OpenPGP keys and *not*
 "ascii-armored" or "plain text" OpenPGP key material. For the latter,
 use `apt::key::plain`.
 
+The `.gpg` extension is compulsory for `apt` to pickup the key properly.
+
 apt::key::plain
 ---------------
 
-- 
cgit v1.2.3


From dc1a19e6cb7f05815f95f90033d212758f59744b Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 31 Aug 2015 09:54:28 +0000
Subject: Linting.

---
 manifests/key.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/key.pp b/manifests/key.pp
index b396c1e..7be526e 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -1,8 +1,8 @@
-define apt::key ($ensure = 'present', $source) {
+define apt::key ($source, $ensure = 'present') {
   file {
-    "/etc/apt/trusted.gpg.d/$name":
-      source => $source,
+    "/etc/apt/trusted.gpg.d/${name}":
       ensure => $ensure,
+      source => $source,
       notify => Exec['refresh_apt'],
   }
 }
-- 
cgit v1.2.3


From 8745de17d64a6eac0eb9f15c19f990fd80383c1f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 31 Aug 2015 09:55:17 +0000
Subject: Quote apt-key variable parameter.

This is not perfect protection against special chars that the shell may
interpret, but should help at least in case $name contains spaces.
---
 manifests/key/plain.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/key/plain.pp b/manifests/key/plain.pp
index a24a51b..e4a2f89 100644
--- a/manifests/key/plain.pp
+++ b/manifests/key/plain.pp
@@ -5,7 +5,7 @@ define apt::key::plain ($source) {
     "${apt::apt_base_dir}/keys":
       ensure  => directory;
   }
-  exec { "apt-key add ${apt::apt_base_dir}/keys/${name}":
+  exec { "apt-key add '${apt::apt_base_dir}/keys/${name}'":
     subscribe   => File["${apt::apt_base_dir}/keys/${name}"],
     refreshonly => true,
     notify      => Exec['refresh_apt'],
-- 
cgit v1.2.3


From 5f7232b420e02eaa38c14a7be75034d9b3cdd64b Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 31 Aug 2015 10:00:09 +0000
Subject: Add validation for apt::key's name.

It's great to document requirements in README, but error'ing out whenever
the user messes up is even better IMO.
---
 README           | 1 +
 manifests/key.pp | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/README b/README
index 85cf6df..1a83ac9 100644
--- a/README
+++ b/README
@@ -99,6 +99,7 @@ This module needs:
 
 - the lsb module: git://labs.riseup.net/shared-lsb
 - the common module: git://labs.riseup.net/shared-common
+- the stdlib module: https://forge.puppetlabs.com/puppetlabs/stdlib
 
 By default, on normal hosts, this module sets the configuration option
 DSelect::Clean to 'auto'. On virtual servers, the value is set by default to
diff --git a/manifests/key.pp b/manifests/key.pp
index 7be526e..65b62e9 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -1,4 +1,9 @@
 define apt::key ($source, $ensure = 'present') {
+  validate_re(
+    $name, '\.gpg$',
+    'An apt::key resource name must have the .gpg extension',
+  )
+
   file {
     "/etc/apt/trusted.gpg.d/${name}":
       ensure => $ensure,
-- 
cgit v1.2.3


From cc53ce119f5b9b239bc1b8cdcaae6a668b8d1f8c Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 3 Oct 2015 23:44:21 -0400
Subject: Extraneous copy of license file

GPLv3 was already applied 3 years ago to this code base. See LICENSE
file.
---
 gpl.txt | 674 ----------------------------------------------------------------
 1 file changed, 674 deletions(-)
 delete mode 100644 gpl.txt

diff --git a/gpl.txt b/gpl.txt
deleted file mode 100644
index 94a9ed0..0000000
--- a/gpl.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-- 
cgit v1.2.3


From f8980538c1e27335d23e971e10487962091c5bb4 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 9 Oct 2015 16:39:19 -0400
Subject: Improve unattended-upgrades origin selectors

  * On squeeze, use release fact instead of hardcoded release name
  * On wheezy, special-case because codename selector is not available
  * On jessie and up, start pulling in point-release updates. The
    codename selector ensures that we won't be upgrading to a new
    release automatically.
---
 templates/50unattended-upgrades.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 2afebfe..7c65d10 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -7,12 +7,16 @@ Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:${distro_codename}-backports";
 <% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::debian_codename') == 'squeeze' -%>
 Unattended-Upgrade::Allowed-Origins {
-  "${distro_id}:oldoldstable";
+  "${distro_id}:<%= scope.lookupvar('::debian_release') %>";
   "${distro_id}:squeeze-lts";
-<% else -%>
+<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::debian_codename') == 'wheezy' -%>
 Unattended-Upgrade::Origins-Pattern {
   "origin=Debian,archive=<%= scope.lookupvar('::debian_release') %>,label=Debian-Security";
   "origin=Debian,archive=${distro_codename}-lts";
+<% else -%>
+Unattended-Upgrade::Origins-Pattern {
+  "origin=Debian,codename=${distro_codename},label=Debian";
+  "origin=Debian,codename=${distro_codename},label=Debian-Security";
 <% end -%>
 };
 
-- 
cgit v1.2.3


From 3dea5b8df77f1ab8224037eacb186ff0c026e378 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 9 Oct 2015 17:12:31 -0400
Subject: Fix debian_codename fact when falling back to parsing
 /etc/debian_version

---
 lib/facter/debian_codename.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/facter/debian_codename.rb b/lib/facter/debian_codename.rb
index 73eeea2..06ec5ff 100644
--- a/lib/facter/debian_codename.rb
+++ b/lib/facter/debian_codename.rb
@@ -32,7 +32,7 @@ Facter.add(:debian_codename) do
   setcode do
     debian_version = File.open('/etc/debian_version', &:readline)
     if debian_version.match(/^\d+/)
-      version_to_codename(version_to_codename.scan(/^(\d+)/)[0][0])
+      version_to_codename(debian_version.scan(/^(\d+)/)[0][0])
     elsif debian_version.match(/^[a-z]+\/(sid|unstable)/)
       debian_version.scan(/^([a-z]+)\//)[0][0]
     end
-- 
cgit v1.2.3


From e714859a10776123afe77bbd15d9f7a02ea9682f Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 9 Oct 2015 16:59:33 -0400
Subject: Make it possible to specify own template.

Micah found an issue with usage of config_content: if you call template('...')
yourself and pass that on to config_content, then your template gets evaluated
without all of the variables. This means that you don't hava access to
blacklisted_packages, mail_recipient or mailonlyonerror.

To make it possible to use a different template while still having access to
those variables, let's make it possible to change the template name that we're
using.
---
 manifests/unattended_upgrades.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 6cb0518..ffb5fad 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,5 +1,6 @@
 class apt::unattended_upgrades (
   $config_content = undef,
+  $config_template = 'apt/50unattended-upgrades.erb',
   $mailonlyonerror = true,
   $mail_recipient = 'root',
   $blacklisted_packages = [],
@@ -11,7 +12,7 @@ class apt::unattended_upgrades (
   }
 
   $file_content = $config_content ? {
-    undef   => template('apt/50unattended-upgrades.erb'),
+    undef   => template($config_template),
     default => $config_content
   }
 
-- 
cgit v1.2.3


From 99fe7db72135c8bca025a5870e693689b8803d94 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 9 Oct 2015 17:18:57 -0400
Subject: Document the new config_template parameter

Also add an example for how to use the apt::unattended_upgrades class.
---
 README | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README b/README
index 7dfe0d1..45e0797 100644
--- a/README
+++ b/README
@@ -376,6 +376,7 @@ The class has the following parameters that you can use to change the contents
 of the configuration file. The values shown here are the default values:
 
  * $config_content = undef
+ * $config_template = 'apt/50unattended-upgrades.erb'
  * $mailonlyonerror = true
  * $mail_recipient = 'root'
  * $blacklisted_packages = []
@@ -383,6 +384,16 @@ of the configuration file. The values shown here are the default values:
 Note that using $config_content actually specifies all of the configuration
 contents and thus makes the other parameters useless.
 
+example:
+
+    class { 'apt::unattended_upgrades':
+      config_template      => 'site_apt/50unattended-upgrades.jessie',
+      blacklisted_packages => [
+       'libc6', 'libc6-dev', 'libc6-i686', 'mysql-server', 'redmine', 'nodejs',
+       'bird'
+      ],
+    }
+
 Defines
 =======
 
-- 
cgit v1.2.3


From b5c65e29f1ad0d27420e8ab0f60a2c454150e3de Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 2 Nov 2015 23:50:08 +0100
Subject: [feat] Support vivid, wily, xenial ubuntu release

---
 templates/Ubuntu/preferences_vivid.erb  | 1 +
 templates/Ubuntu/preferences_wily.erb   | 1 +
 templates/Ubuntu/preferences_xenial.erb | 1 +
 3 files changed, 3 insertions(+)
 create mode 120000 templates/Ubuntu/preferences_vivid.erb
 create mode 120000 templates/Ubuntu/preferences_wily.erb
 create mode 120000 templates/Ubuntu/preferences_xenial.erb

diff --git a/templates/Ubuntu/preferences_vivid.erb b/templates/Ubuntu/preferences_vivid.erb
new file mode 120000
index 0000000..3debe4f
--- /dev/null
+++ b/templates/Ubuntu/preferences_vivid.erb
@@ -0,0 +1 @@
+preferences_maverick.erb
\ No newline at end of file
diff --git a/templates/Ubuntu/preferences_wily.erb b/templates/Ubuntu/preferences_wily.erb
new file mode 120000
index 0000000..3debe4f
--- /dev/null
+++ b/templates/Ubuntu/preferences_wily.erb
@@ -0,0 +1 @@
+preferences_maverick.erb
\ No newline at end of file
diff --git a/templates/Ubuntu/preferences_xenial.erb b/templates/Ubuntu/preferences_xenial.erb
new file mode 120000
index 0000000..3debe4f
--- /dev/null
+++ b/templates/Ubuntu/preferences_xenial.erb
@@ -0,0 +1 @@
+preferences_maverick.erb
\ No newline at end of file
-- 
cgit v1.2.3


From bfa973a66896208e2cf0bea37ec15a4f950f09bd Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 4 Dec 2015 12:33:35 -0500
Subject: Use $ubuntu_url as default value of $backports_url on Ubuntu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ubuntu shouldn't be using debian backports by default.

This was written by Anoine Beaupré, but split from the commit "move
backports to snippets" since the change is unrelated and needs to be
more visible in the commit history.
---
 manifests/params.pp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 9c85b6f..28da13e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,13 +6,16 @@ class apt::params () {
   $use_next_release = false
   $debian_url = 'http://httpredir.debian.org/debian/'
   $security_url = 'http://security.debian.org/'
+  $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
   $backports_url = $::debian_codename ? {
     'squeeze'  => 'http://backports.debian.org/debian-backports/',
-    default => $debian_url
+    default => $::operatingsystem ? {
+      'Ubuntu' => $ubuntu_url,
+      default  => $debian_url,
+    }
   }
   $lts_url = $debian_url
   $volatile_url = 'http://volatile.debian.org/debian-volatile/'
-  $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
   $repos = 'auto'
   $custom_preferences = ''
   $disable_update = false
-- 
cgit v1.2.3


From e4a9222d861ae05a8d9d0a43f2ed4aa0be229390 Mon Sep 17 00:00:00 2001
From: Antoine Beaupré <anarcat@koumbit.org>
Date: Thu, 11 Jun 2015 11:04:46 -0400
Subject: move backports to snippets

this allows for third party modules to enable this on the fly
---
 manifests/init.pp                 | 17 ++++++++++++++++-
 templates/Debian/sources.list.erb | 12 ------------
 templates/Ubuntu/sources.list.erb |  8 --------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index fc93eb3..4f5dd25 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,7 +46,7 @@ class apt(
     default => $custom_sources_list
   }
   file {
-    # include main, security and backports
+    # include main and security
     # additional sources should be included via the apt::sources_list define
     '/etc/apt/sources.list':
       content => $sources_content,
@@ -98,6 +98,21 @@ class apt(
   # backports uses the normal archive key now
   package { 'debian-backports-keyring': ensure => absent }
 
+  if $use_backports {
+    if ($release != "testing" and $release != "unstable" and $release != "experimental") {
+      apt::sources_list {
+        "${codename}-backports":
+          content => "deb $backports_url ${codename}-backports ${apt::real_repos}",
+      }
+      if $include_src {
+        apt::sources_list {
+          "${codename}-backports-src":
+            content => "deb-src $backports_url ${codename}-backports ${apt::real_repos}",
+        }
+      }
+    }
+  }
+
   include common::moduledir
   common::module_dir { 'apt': }
   $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index bde87ac..44eea53 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -19,18 +19,6 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
 # There is no security support for <%= release %>
 <% end -%>
 
-<% if use_backports=scope.lookupvar('apt::use_backports') -%>
-# backports
-<%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
-# There is no backports archive for <%= release %>
-<%   else -%>
-deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %>
-<%     if include_src -%>
-deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
-<%     end
-     end
-   end -%>
-
 <% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
 # volatile
 <%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index d0a3a5a..e6d2f64 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -20,11 +20,3 @@ deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
 <% if include_src -%>
 deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
 <% end -%>
-
-<% if use_backports=scope.lookupvar('apt::use_backports') -%>
-# backports
-deb <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<%   if include_src -%>
-deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<%   end
-   end -%>
-- 
cgit v1.2.3


From f492e5840b3d2122e347ead5d1c240e794120d0e Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 9 Oct 2015 13:50:43 -0400
Subject: Switch old $release and $codename local variables to new debian_*
 facts

---
 manifests/init.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4f5dd25..16593c7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -99,15 +99,15 @@ class apt(
   package { 'debian-backports-keyring': ensure => absent }
 
   if $use_backports {
-    if ($release != "testing" and $release != "unstable" and $release != "experimental") {
+    if (${::debian_release} != "testing" and ${::debian_release} != "unstable" and ${::debian_release} != "experimental") {
       apt::sources_list {
-        "${codename}-backports":
-          content => "deb $backports_url ${codename}-backports ${apt::real_repos}",
+        'backports':
+          content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}",
       }
       if $include_src {
         apt::sources_list {
-          "${codename}-backports-src":
-            content => "deb-src $backports_url ${codename}-backports ${apt::real_repos}",
+          'backports-src':
+            content => "deb-src $backports_url ${::debian_codename}-backports ${apt::real_repos}",
         }
       }
     }
-- 
cgit v1.2.3


From 4d3b720308964c027674bb08c49f142b4684ff58 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 9 Oct 2015 14:08:46 -0400
Subject: Simplify conditional expressions

---
 manifests/init.pp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 16593c7..2660612 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -98,17 +98,15 @@ class apt(
   # backports uses the normal archive key now
   package { 'debian-backports-keyring': ensure => absent }
 
-  if $use_backports {
-    if (${::debian_release} != "testing" and ${::debian_release} != "unstable" and ${::debian_release} != "experimental") {
+  if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
+    apt::sources_list {
+      'backports':
+        content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}",
+    }
+    if $include_src {
       apt::sources_list {
-        'backports':
-          content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}",
-      }
-      if $include_src {
-        apt::sources_list {
-          'backports-src':
-            content => "deb-src $backports_url ${::debian_codename}-backports ${apt::real_repos}",
-        }
+        'backports-src':
+          content => "deb-src $backports_url ${::debian_codename}-backports ${apt::real_repos}",
       }
     }
   }
-- 
cgit v1.2.3


From 2942cd0dd88ec3a1d38197d148af9952a397b67c Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 4 Dec 2015 14:29:36 -0500
Subject: remove requirement on lsb package for sources.list file

Managing requirements for installing the lsb package has proven over
time to make no sense. The best approach to this is to require
lsb-release to be installed alongside puppet, since otherwise there are
so much facts that get no value during the run and you end up needing to
run puppet twice to get the real end result.

Also, since we're not including a class that is actually installing the
'lsb' package, that require line makes it so that including the apt
module doesn't work, and there's no documentation in the README about
needing to provide a package{'lsb':} resource with the apt class.

Because of all that, it makes more sense to just get rid of that require
line and mark lsb as a pre-requirement in the README file.
---
 README            | 4 ++--
 manifests/init.pp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 45e0797..e46a3c7 100644
--- a/README
+++ b/README
@@ -99,9 +99,9 @@ Requirements
 
 This module needs:
 
+- the lsb-release package should be installed on the server prior to running
+  puppet. otherwise, all of the $::lsb* facts will be empty during runs.
 - the common module: https://gitlab.com/shared-puppet-modules-group/common
-- the lsb module: https://gitlab.com/shared-puppet-modules-group/lsb
-  (optional but recommended, required on Ubuntu)
 
 By default, on normal hosts, this module sets the configuration option
 DSelect::Clean to 'auto'. On virtual servers, the value is set by default to
diff --git a/manifests/init.pp b/manifests/init.pp
index 2660612..6732ade 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -50,7 +50,6 @@ class apt(
     # additional sources should be included via the apt::sources_list define
     '/etc/apt/sources.list':
       content => $sources_content,
-      require => Package['lsb'],
       notify  => Exec['refresh_apt'],
       owner   => root,
       group   => 0,
-- 
cgit v1.2.3


From 6b27efb4346e61280f041b63dd8df7ad1f2e7f81 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 7 Dec 2015 00:22:50 +0100
Subject: Add inital puppet rspec test for custom facts

---
 .gitignore                     | 12 ++++++++
 Gemfile                        | 37 +++++++++++++++++++++++
 README                         |  8 +++++
 Rakefile                       | 19 ++++++++++++
 spec/spec_helper.rb            | 12 ++++++++
 spec/unit/custom_facts_spec.rb | 67 ++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 155 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Gemfile
 create mode 100644 Rakefile
 create mode 100644 spec/spec_helper.rb
 create mode 100644 spec/unit/custom_facts_spec.rb

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a54aa97
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+/pkg/
+/Gemfile.lock
+/vendor/
+/spec/fixtures/manifests/*
+/spec/fixtures/modules/*
+!/spec/fixtures/modules/apt
+!/spec/fixtures/modules/apt/*
+/.vagrant/
+/.bundle/
+/coverage/
+/.idea/
+*.iml
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..4033611
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,37 @@
+source "https://rubygems.org"
+
+def location_for(place, fake_version = nil)
+  if place =~ /^(git[:@][^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
+
+group :test do
+  gem "rake"
+  gem "rspec", '< 3.2.0'
+  gem "rspec-puppet"
+  gem "puppetlabs_spec_helper"
+  gem "metadata-json-lint"
+  gem "rspec-puppet-facts"
+  gem "mocha"
+end
+
+facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
+if facterversion
+    gem 'facter', *location_for(facterversion)
+else
+    gem 'facter', :require => false
+end
+
+puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
+if puppetversion
+    gem 'puppet', *location_for(puppetversion)
+else
+    gem 'puppet', :require => false
+end
+
diff --git a/README b/README
index e46a3c7..e08cc5b 100644
--- a/README
+++ b/README
@@ -568,6 +568,14 @@ make sure APT indexes are up-to-date before a package upgrade is
 attempted, but don't want "apt-get update" to happen on every Puppet
 run.
 
+Tests
+=====
+
+To run pupept rspec tests:
+
+    bundle install --path vendor/bundle
+    bundle exec rake spec
+
 
 Licensing
 =========
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..85326bb
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,19 @@
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+
+desc "Validate manifests, templates, and ruby files"
+task :validate do
+  Dir['manifests/**/*.pp'].each do |manifest|
+    sh "puppet parser validate --noop #{manifest}"
+  end
+  Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
+    sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
+  end
+  Dir['templates/**/*.erb'].each do |template|
+    sh "erb -P -x -T '-' #{template} | ruby -c"
+  end
+end
+
+task :test => [:lint, :syntax , :validate, :spec]
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000..21d1a98
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,12 @@
+# https://puppetlabs.com/blog/testing-modules-in-the-puppet-forge
+require 'rspec-puppet'
+require 'mocha/api'
+
+RSpec.configure do |c|
+
+  c.module_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+  c.color = true
+
+  #Puppet.features.stubs(:root? => true)
+
+end
diff --git a/spec/unit/custom_facts_spec.rb b/spec/unit/custom_facts_spec.rb
new file mode 100644
index 0000000..2d36bd7
--- /dev/null
+++ b/spec/unit/custom_facts_spec.rb
@@ -0,0 +1,67 @@
+require "spec_helper"
+
+describe "Facter::Util::Fact" do
+  before {
+    Facter.clear
+  }
+
+  describe 'custom facts' do
+
+    context 'Debian 7' do
+      before do
+        Facter.fact(:operatingsystem).stubs(:value).returns("Debian")
+        Facter.fact(:operatingsystemrelease).stubs(:value).returns("7.8")
+        Facter.fact(:lsbdistcodename).stubs(:value).returns("wheezy")
+      end
+
+      it "debian_release = oldstable" do
+        expect(Facter.fact(:debian_release).value).to eq('oldstable')
+      end
+
+      it "debian_codename = wheezy" do
+        expect(Facter.fact(:debian_codename).value).to eq('wheezy')
+      end
+    end
+
+    context 'Debian 8' do
+      before do
+        Facter.fact(:operatingsystem).stubs(:value).returns("Debian")
+        Facter.fact(:operatingsystemrelease).stubs(:value).returns("8.0")
+        Facter.fact(:lsbdistcodename).stubs(:value).returns("jessie")
+      end
+
+      it "debian_release = stable" do
+        expect(Facter.fact(:debian_release).value).to eq('stable')
+      end
+
+      it "debian_codename = jessie" do
+        expect(Facter.fact(:debian_codename).value).to eq('jessie')
+      end
+    end
+
+    context 'Ubuntu 15.10' do
+      before do
+        Facter.fact(:operatingsystem).stubs(:value).returns("Ubuntu")
+        Facter.fact(:operatingsystemrelease).stubs(:value).returns("15.10")
+        Facter.fact(:lsbdistcodename).stubs(:value).returns("Vivid")
+      end
+
+      it "ubuntu_codename = Vivid" do
+        expect(Facter.fact(:ubuntu_codename).value).to eq('Vivid')
+      end
+    end
+
+  end
+
+  describe "Test 'apt_running' fact" do
+    it "should return true when apt-get is running" do
+      Facter::Util::Resolution.stubs(:exec).with("pgrep apt-get >/dev/null 2>&1 && echo true || echo false").returns("true")
+      expect(Facter.fact(:apt_running).value).to eq('true')
+    end
+    it "should return false when apt-get is not running" do
+      Facter::Util::Resolution.stubs(:exec).with("pgrep apt-get >/dev/null 2>&1 && echo true || echo false").returns("false")
+      expect(Facter.fact(:apt_running).value).to eq('false')
+    end
+  end
+
+end
-- 
cgit v1.2.3


From a70c52c1d4f399c22fa6c71289031350a1da44b5 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 7 Dec 2015 14:27:04 +0100
Subject: Fix loading of util/debian.rb for custom facts

requirering the facter/util/debian.rb module causes
puppet warnings on wheezy hosts, and custom facts like
`$::debian_codename` cannot be evaluated.

    warning: Could not load fact file
      /srv/dev/projects/puppet/shared-modules//apt/lib/facter/debian_nextcodename.rb:
      no such file to load -- facter/util/debian

Removing the require line solves this.
---
 lib/facter/debian_codename.rb     | 2 ++
 lib/facter/debian_lts.rb          | 2 ++
 lib/facter/debian_nextcodename.rb | 2 ++
 lib/facter/debian_release.rb      | 2 ++
 lib/facter/ubuntu_nextcodename.rb | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/lib/facter/debian_codename.rb b/lib/facter/debian_codename.rb
index 06ec5ff..254877a 100644
--- a/lib/facter/debian_codename.rb
+++ b/lib/facter/debian_codename.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def version_to_codename(version)
diff --git a/lib/facter/debian_lts.rb b/lib/facter/debian_lts.rb
index 1c137e1..f53a9eb 100644
--- a/lib/facter/debian_lts.rb
+++ b/lib/facter/debian_lts.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 Facter.add(:debian_lts) do
diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb
index af16cc8..6e994a4 100644
--- a/lib/facter/debian_nextcodename.rb
+++ b/lib/facter/debian_nextcodename.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def debian_codename_to_next(codename)
diff --git a/lib/facter/debian_release.rb b/lib/facter/debian_release.rb
index 09e8eef..2c334cc 100644
--- a/lib/facter/debian_release.rb
+++ b/lib/facter/debian_release.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/debian'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def debian_codename_to_release(codename)
diff --git a/lib/facter/ubuntu_nextcodename.rb b/lib/facter/ubuntu_nextcodename.rb
index 38b64ad..ba985bf 100644
--- a/lib/facter/ubuntu_nextcodename.rb
+++ b/lib/facter/ubuntu_nextcodename.rb
@@ -1,5 +1,7 @@
 begin
   require 'facter/util/ubuntu'
+rescue LoadError
+  require "#{File.dirname(__FILE__)}/util/debian"
 end
 
 def ubuntu_codename_to_next(codename)
-- 
cgit v1.2.3


From bf4daa73b11fe7d7db49a6f863d8e850288c57e8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 7 Dec 2015 14:36:48 +0100
Subject: [docs] Add test docs how to use custom facter/puppet version

---
 README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README b/README
index e08cc5b..410201d 100644
--- a/README
+++ b/README
@@ -576,6 +576,10 @@ To run pupept rspec tests:
     bundle install --path vendor/bundle
     bundle exec rake spec
 
+Using different facter/puppet versions:
+
+    FACTER_GEM_VERSION=1.6.10 PUPPET_GEM_VERSION=2.7.23 bundle install --path vendor/bundle
+    bundle exec rake spec
 
 Licensing
 =========
-- 
cgit v1.2.3


From 5381cb7b617a78b75b593a21fe9e0e8356013f6a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 7 Dec 2015 16:51:20 +0100
Subject: [bug] Fix debian_nextcodename on wheezy hosts

I noticed this behaviour because $::debian_nextcodename was
"squeeze" on a wheezy host.
For debugging, i inserted a "puts codenames" in
lib/facter/debian_nextcodename.rb, and it turned out that it
was sorted differently on wheezy and jessie hosts:

On wheezy:

    buster
    stretch
    jessie
    wheezy
    squeeze
    lenny

On jessie:

    lenny
    squeeze
    wheezy
    jessie
    stretch
    buster

So i decided to rewrite this so this doesn't happen again.
---
 lib/facter/debian_nextcodename.rb | 9 ++++-----
 lib/facter/util/ubuntu.rb         | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb
index 6e994a4..c4c569b 100644
--- a/lib/facter/debian_nextcodename.rb
+++ b/lib/facter/debian_nextcodename.rb
@@ -8,11 +8,10 @@ def debian_codename_to_next(codename)
   if codename == "sid"
     return "experimental"
   else
-    codenames = Facter::Util::Debian::CODENAMES.values
-    i = codenames.index(codename)
-    if i and i+1 < codenames.count
-      return codenames[i+1]
-    end
+    codenames = Facter::Util::Debian::CODENAMES
+    versions  = Facter::Util::Debian::CODENAMES.invert
+    current_version = versions[codename]
+    return codenames[(current_version.to_i + 1).to_s]
   end
 end
 
diff --git a/lib/facter/util/ubuntu.rb b/lib/facter/util/ubuntu.rb
index 1b2411a..52c15e8 100644
--- a/lib/facter/util/ubuntu.rb
+++ b/lib/facter/util/ubuntu.rb
@@ -14,6 +14,7 @@ module Facter
         "utopic",
         "vivid",
         "wily",
+        "xenial"
       ]
     end
   end
-- 
cgit v1.2.3


From 2c656517bd463f23996f50c2e49503909df06173 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 7 Dec 2015 19:44:14 +0100
Subject: [rspec] extend test for custom facts

---
 spec/unit/custom_facts_spec.rb | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/spec/unit/custom_facts_spec.rb b/spec/unit/custom_facts_spec.rb
index 2d36bd7..9a28d92 100644
--- a/spec/unit/custom_facts_spec.rb
+++ b/spec/unit/custom_facts_spec.rb
@@ -21,6 +21,14 @@ describe "Facter::Util::Fact" do
       it "debian_codename = wheezy" do
         expect(Facter.fact(:debian_codename).value).to eq('wheezy')
       end
+
+      it "debian_nextcodename = jessie" do
+        expect(Facter.fact(:debian_nextcodename).value).to eq('jessie')
+      end
+
+      it "debian_nextrelease = stable" do
+        expect(Facter.fact(:debian_nextrelease).value).to eq('stable')
+      end
     end
 
     context 'Debian 8' do
@@ -37,20 +45,31 @@ describe "Facter::Util::Fact" do
       it "debian_codename = jessie" do
         expect(Facter.fact(:debian_codename).value).to eq('jessie')
       end
+
+      it "debian_nextcodename = stretch" do
+        expect(Facter.fact(:debian_nextcodename).value).to eq('stretch')
+      end
+
+      it "debian_nextrelease = testing" do
+        expect(Facter.fact(:debian_nextrelease).value).to eq('testing')
+      end
     end
 
     context 'Ubuntu 15.10' do
       before do
         Facter.fact(:operatingsystem).stubs(:value).returns("Ubuntu")
         Facter.fact(:operatingsystemrelease).stubs(:value).returns("15.10")
-        Facter.fact(:lsbdistcodename).stubs(:value).returns("Vivid")
+        Facter.fact(:lsbdistcodename).stubs(:value).returns("wily")
       end
 
-      it "ubuntu_codename = Vivid" do
-        expect(Facter.fact(:ubuntu_codename).value).to eq('Vivid')
+      it "ubuntu_codename = wily" do
+        expect(Facter.fact(:ubuntu_codename).value).to eq('wily')
       end
-    end
 
+      it "ubuntu_nextcodename = xenial" do
+        expect(Facter.fact(:ubuntu_nextcodename).value).to eq('xenial')
+      end
+    end
   end
 
   describe "Test 'apt_running' fact" do
-- 
cgit v1.2.3


From abe5212b01a9ed889a486795b26e845f56e334a2 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 7 Dec 2015 21:55:01 +0100
Subject: Fix require path for ubuntu_nextcodename.rb

---
 lib/facter/ubuntu_nextcodename.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/facter/ubuntu_nextcodename.rb b/lib/facter/ubuntu_nextcodename.rb
index ba985bf..dcd1d42 100644
--- a/lib/facter/ubuntu_nextcodename.rb
+++ b/lib/facter/ubuntu_nextcodename.rb
@@ -1,7 +1,7 @@
 begin
   require 'facter/util/ubuntu'
 rescue LoadError
-  require "#{File.dirname(__FILE__)}/util/debian"
+  require "#{File.dirname(__FILE__)}/util/ubuntu"
 end
 
 def ubuntu_codename_to_next(codename)
-- 
cgit v1.2.3


From d67dfe4beb6cc21660281a5c02a4c4b7a061fa1c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 9 Dec 2015 16:31:35 +0100
Subject: [feat] Don't run an additional apt-get update

When adding custom keys, an additional `apt-get update` would
be run before the Exec['refresh_apt'], which don't make sense.
---
 manifests/init.pp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 6732ade..1e7ddd7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -123,17 +123,14 @@ class apt(
       mode    => '0755',
     }
     exec { 'custom_keys':
-      command     => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && /usr/bin/apt-get update",
+      command     => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\;",
       subscribe   => File["${apt_base_dir}/keys.d"],
       refreshonly => true,
+      notify      => Exec[refresh_apt]
     }
     if $custom_preferences != false {
       Exec['custom_keys'] {
-        before => [ Exec[refresh_apt], File['apt_config'] ]
-      }
-    } else {
-      Exec['custom_keys'] {
-        before => Exec[refresh_apt]
+        before => File['apt_config']
       }
     }
   }
-- 
cgit v1.2.3


From 275ca2e4cf8759cb723f1d7791515cdcbfbbe836 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 19 Dec 2015 00:25:05 +0100
Subject: [feat] Enable gitlab CI builds, simplify Gemfile

---
 .gitlab-ci.yml | 12 ++++++++++++
 Gemfile        | 28 ++--------------------------
 2 files changed, 14 insertions(+), 26 deletions(-)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f7b8eca
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+before_script:
+  - ruby -v
+  - gem install bundler --no-ri --no-rdoc
+  - bundle install --jobs $(nproc)  "${FLAGS[@]}"
+
+# don't fail on lint warnings
+rspec:
+  script:
+    - bundle exec rake lint || /bin/true
+    - bundle exec rake syntax
+    - bundle exec rake validate
+    - bundle exec rake spec
diff --git a/Gemfile b/Gemfile
index 4033611..8925a90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,37 +1,13 @@
 source "https://rubygems.org"
 
-def location_for(place, fake_version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-
 group :test do
   gem "rake"
   gem "rspec", '< 3.2.0'
+  gem "puppet", ENV['PUPPET_VERSION'] || ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION'] || '~> 3.7.0'
+  gem "facter", ENV['FACTER_VERSION'] || ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION'] || '~> 2.2.0'
   gem "rspec-puppet"
   gem "puppetlabs_spec_helper"
   gem "metadata-json-lint"
   gem "rspec-puppet-facts"
   gem "mocha"
 end
-
-facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
-if facterversion
-    gem 'facter', *location_for(facterversion)
-else
-    gem 'facter', :require => false
-end
-
-puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
-if puppetversion
-    gem 'puppet', *location_for(puppetversion)
-else
-    gem 'puppet', :require => false
-end
-
-- 
cgit v1.2.3


From fa1751c4de0154de7431ea18f57ddaeff329cf73 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 5 Jan 2016 11:39:57 +0100
Subject: [bug] Deploy preferene snippets before apt_refresh

When pinning packages with apt::preferences_snippet,
we need to make sure these get deployed before an
`apt-get update` is triggered, so pinned packages can
get installed in the right way with a single puppetrun.
---
 manifests/preferences_snippet.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 0c7b7bb..99feac4 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -31,7 +31,8 @@ define apt::preferences_snippet (
 
   file { "/etc/apt/preferences.d/${name}":
     ensure => $ensure,
-    owner  => root, group => 0, mode => '0644';
+    owner  => root, group => 0, mode => '0644',
+    before => Exec['refresh_apt'];
   }
 
   case $source {
-- 
cgit v1.2.3


From f12b007edd557e91359fd9a5fba57f49e4a59a04 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 26 Jan 2016 14:42:17 +0100
Subject: [refactor] Unify `apt-get update` into one resource

Before, there were two Execs that did an `apt-get update`,
`Exec[refresh_apt]` and `Exec[apt_updated]`, which were triggered
by different resources.
This changes gets rid of the first one, and all resources now depend
on `Exec[apt_updated]`.
---
 README                           | 38 +++++++++++++++++++-------------------
 manifests/apt_conf.pp            |  2 +-
 manifests/dist_upgrade.pp        | 11 +----------
 manifests/dot_d_directories.pp   | 11 ++---------
 manifests/init.pp                | 14 +++++++++++++-
 manifests/key.pp                 |  2 +-
 manifests/key/plain.pp           |  2 +-
 manifests/preferences_snippet.pp |  2 +-
 manifests/sources_list.pp        |  2 +-
 manifests/update.pp              | 12 +++---------
 10 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/README b/README
index 410201d..e097a7e 100644
--- a/README
+++ b/README
@@ -17,6 +17,14 @@ Ubuntu support is lagging behind but not absent either.
 
 ! Upgrade Notice !
 
+ * The `disable_update` parameter has been removed. The main apt class
+   defaults to *not* run an `apt-get update` on every run anyway so this
+   parameter seems useless.
+   You can include the `apt::update` class if you want it to be run every time.
+
+ * The `apt::upgrade_package` now doesn't automatically call an Exec['apt_updated']
+   anymore, so you would need to include `apt::update` now by hand.
+
  * The apt::codename parameter has been removed. In its place, the
    debian_codename fact may be overridden via an environment variable. This
    will affect all other debian_* facts, and achieve the same result.
@@ -188,15 +196,6 @@ Class parameters:
   If this variable is set the default repositories list ("main contrib non-free")
   is overriden.
 
-* disable_update
-
-  Disable "apt-get update" which is normally triggered by apt::upgrade_package 
-  and apt::dist_upgrade. 
-
-  Note that nodes can be updated once a day by using 
-    APT::Periodic::Update-Package-Lists "1";
-  in i.e. /etc/apt/apt.conf.d/80_apt_update_daily.
-
 * custom_preferences
 
   For historical reasons (Debian Lenny's version of APT did not support the use
@@ -296,9 +295,6 @@ classes may inherit from this one and add to its subscription list
 using the plusignment ('+>') operator. A real-world example can be
 seen in the apt::dist_upgrade::initiator source.
 
-When this class is included the APT indexes are updated on every
-Puppet run due to the author's lack of Puppet wizardry.
-
 apt::dist_upgrade::initiator
 ----------------------------
 
@@ -555,18 +551,22 @@ Exec['apt_updated']
 -------------------
 
 After this point the APT indexes are up-to-date.
+This resource is set to `refreshonly => true` so it is not run on
+every puppetrun. To run this every time, you can include the `apt::update`
+class.
 
 This resource is usually used like this to ensure current packages are
 installed by Package resources:
 
-  include apt::update
-  Package { require => Exec['apt_updated'] }
+    include apt::update
+    Package { require => Exec['apt_updated'] }
+
+Note that nodes can be updated once a day by using
+
+    APT::Periodic::Update-Package-Lists "1";
+
+in i.e. /etc/apt/apt.conf.d/80_apt_update_daily.
 
-Please note that the apt::upgrade_package define automatically uses
-this resource so you don't have to manage this yourself if you need to
-make sure APT indexes are up-to-date before a package upgrade is
-attempted, but don't want "apt-get update" to happen on every Puppet
-run.
 
 Tests
 =====
diff --git a/manifests/apt_conf.pp b/manifests/apt_conf.pp
index f446c69..949f615 100644
--- a/manifests/apt_conf.pp
+++ b/manifests/apt_conf.pp
@@ -38,7 +38,7 @@ define apt::apt_conf(
 
   if $refresh_apt {
     File["/etc/apt/apt.conf.d/${name}"] {
-      notify => Exec['refresh_apt'],
+      notify => Exec['apt_updated'],
     }
   }
 
diff --git a/manifests/dist_upgrade.pp b/manifests/dist_upgrade.pp
index bf78dcc..19c031e 100644
--- a/manifests/dist_upgrade.pp
+++ b/manifests/dist_upgrade.pp
@@ -1,18 +1,9 @@
 class apt::dist_upgrade {
 
-  if $apt::disable_update == false {
-    include apt::update
-  }
-
-  $req = $apt::disable_update ? {
-    true    => undef,
-    default => Exec['apt_updated'],
-  }
-
   exec { 'apt_dist-upgrade':
     command     => '/usr/bin/apt-get -q -y -o \'DPkg::Options::=--force-confold\' dist-upgrade',
     refreshonly => true,
-    require     => $req
+    before      => Exec['apt_updated']
   }
 
 }
diff --git a/manifests/dot_d_directories.pp b/manifests/dot_d_directories.pp
index 37c3fc8..0ace863 100644
--- a/manifests/dot_d_directories.pp
+++ b/manifests/dot_d_directories.pp
@@ -5,18 +5,11 @@ class apt::dot_d_directories {
     '/etc/apt/apt.conf.d':
       ensure   => directory,
       checksum => mtime,
-      notify   => Exec['refresh_apt'];
+      notify   => Exec['apt_updated'];
     '/etc/apt/sources.list.d':
       ensure   => directory,
       checksum => mtime,
-      notify   => Exec['refresh_apt'];
-  }
-
-  exec {
-    # "&& sleep 1" is workaround for older(?) clients
-    'refresh_apt':
-      command     => '/usr/bin/apt-get update && sleep 1',
-      refreshonly => true,
+      notify   => Exec['apt_updated'];
   }
 
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 1e7ddd7..f9f9357 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -50,7 +50,7 @@ class apt(
     # additional sources should be included via the apt::sources_list define
     '/etc/apt/sources.list':
       content => $sources_content,
-      notify  => Exec['refresh_apt'],
+      notify  => Exec['apt_updated'],
       owner   => root,
       group   => 0,
       mode    => '0644';
@@ -137,4 +137,16 @@ class apt(
 
   # workaround for preseeded_package component
   file { [ '/var/cache', '/var/cache/local', '/var/cache/local/preseeding' ]: ensure => directory }
+
+  exec { 'update_apt':
+    command     => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
+    require     => [
+      File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
+      File['/etc/apt/sources.list'] ],
+    loglevel    => 'info',
+    refreshonly => true,
+    # Another Semaphor for all packages to reference
+    alias       => [ 'apt_updated', 'refresh_apt']
+  }
+
 }
diff --git a/manifests/key.pp b/manifests/key.pp
index 65b62e9..cb70ec6 100644
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -8,6 +8,6 @@ define apt::key ($source, $ensure = 'present') {
     "/etc/apt/trusted.gpg.d/${name}":
       ensure => $ensure,
       source => $source,
-      notify => Exec['refresh_apt'],
+      notify => Exec['apt_updated'],
   }
 }
diff --git a/manifests/key/plain.pp b/manifests/key/plain.pp
index e4a2f89..dff8b51 100644
--- a/manifests/key/plain.pp
+++ b/manifests/key/plain.pp
@@ -8,6 +8,6 @@ define apt::key::plain ($source) {
   exec { "apt-key add '${apt::apt_base_dir}/keys/${name}'":
     subscribe   => File["${apt::apt_base_dir}/keys/${name}"],
     refreshonly => true,
-    notify      => Exec['refresh_apt'],
+    notify      => Exec['apt_updated'],
   }
 }
diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp
index 99feac4..b7dba0d 100644
--- a/manifests/preferences_snippet.pp
+++ b/manifests/preferences_snippet.pp
@@ -32,7 +32,7 @@ define apt::preferences_snippet (
   file { "/etc/apt/preferences.d/${name}":
     ensure => $ensure,
     owner  => root, group => 0, mode => '0644',
-    before => Exec['refresh_apt'];
+    before => Exec['apt_updated'];
   }
 
   case $source {
diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp
index aefad2d..0ee068d 100644
--- a/manifests/sources_list.pp
+++ b/manifests/sources_list.pp
@@ -23,7 +23,7 @@ define apt::sources_list (
   file { "/etc/apt/sources.list.d/${realname}.list":
     ensure => $ensure,
     owner  => root, group => 0, mode => '0644',
-    notify => Exec['refresh_apt'],
+    notify => Exec['apt_updated'],
   }
 
   if $source {
diff --git a/manifests/update.pp b/manifests/update.pp
index 3f45125..dde8320 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,13 +1,7 @@
-class apt::update {
+class apt::update inherits ::apt {
 
-  exec { 'update_apt':
-    command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
-    require => [
-                File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
-                File['/etc/apt/sources.list'] ],
-    loglevel => info,
-    # Another Semaphor for all packages to reference
-    alias => 'apt_updated'
+  Exec['update_apt'] {
+    refreshonly => false
   }
 
 }
-- 
cgit v1.2.3


From d2ae98e89b4f1a552eb7464f217aa809ac68666b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 26 Jan 2016 14:52:53 +0100
Subject: [feat] Remove `apt-get autoclean` from apt::update

`apt-get autoclean` should not be run on every puppetrun when
including `apt::update`, but rather be configured as a `APT::Periodic`
task that is run by cron, see
https://wiki.debian.org/UnattendedUpgrades.
---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index f9f9357..d6e75cc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -139,7 +139,7 @@ class apt(
   file { [ '/var/cache', '/var/cache/local', '/var/cache/local/preseeding' ]: ensure => directory }
 
   exec { 'update_apt':
-    command     => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean',
+    command     => '/usr/bin/apt-get update',
     require     => [
       File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
       File['/etc/apt/sources.list'] ],
-- 
cgit v1.2.3


From 207218cee80ae99845cb567737f14a5eaafc136d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 26 Jan 2016 15:18:22 +0100
Subject: [refactor] Get rid of the disable_update parameter

The `disable_update` parameter has been removed. The main apt class
defaults to *not* run an `apt-get update` on every run anyway so
this parameter seems useless.
You can include the `apt::update` class if you want it to be
run every time.
---
 manifests/init.pp            |  1 -
 manifests/params.pp          |  1 -
 manifests/upgrade_package.pp | 15 ++-------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index d6e75cc..85f44f0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,7 +18,6 @@ class apt(
   $repos = $apt::params::repos,
   $custom_preferences = $apt::params::custom_preferences,
   $custom_sources_list = '',
-  $disable_update = $apt::params::disable_update,
   $custom_key_dir = $apt::params::custom_key_dir
 ) inherits apt::params {
   case $::operatingsystem {
diff --git a/manifests/params.pp b/manifests/params.pp
index 28da13e..28af06e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -18,6 +18,5 @@ class apt::params () {
   $volatile_url = 'http://volatile.debian.org/debian-volatile/'
   $repos = 'auto'
   $custom_preferences = ''
-  $disable_update = false
   $custom_key_dir = false
 }
diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp
index d607150..30572c9 100644
--- a/manifests/upgrade_package.pp
+++ b/manifests/upgrade_package.pp
@@ -2,10 +2,6 @@ define apt::upgrade_package (
   $version = ''
 ) {
 
-  if $apt::disable_update == false {
-    include apt::update
-  }
-
   $version_suffix = $version ? {
     ''       => '',
     'latest' => '',
@@ -26,17 +22,10 @@ define apt::upgrade_package (
     }
   }
 
-  $req = $apt::disable_update ? {
-    true    => Package['apt-show-versions', 'dctrl-tools'],
-    default => [
-                Exec['apt_updated'],
-                Package['apt-show-versions', 'dctrl-tools']
-              ],
-  }
-
   exec { "apt-get -q -y -o 'DPkg::Options::=--force-confold' install ${name}${version_suffix}":
     onlyif  => [ "grep-status -F Status installed -a -P $name -q", "apt-show-versions -u $name | grep -q upgradeable" ],
-    require => $req
+    require => Package['apt-show-versions', 'dctrl-tools'],
+    before  => Exec['apt_updated']
   }
 
 }
-- 
cgit v1.2.3


From c4a0aff2af47d48ca1b41110274ebb3879c4b758 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Tue, 2 Feb 2016 17:07:21 -0500
Subject: Manage unattended-upgrades log directory

In some situations, the log directory for unattended-upgrades might not
exist. In those cases, packages will not get upgraded!

unattended-upgrades crashes with a python backtrace because the log dir
is not present.
---
 manifests/unattended_upgrades.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index ffb5fad..52d7542 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -11,6 +11,16 @@ class apt::unattended_upgrades (
     ensure  => $ensure_version
   }
 
+  # For some reason, this directory is sometimes absent, which causes
+  # unattended-upgrades to crash.
+  file { '/var/log/unattended-upgrades':
+    ensure  => directory,
+    owner   => 'root',
+    group   => 0,
+    mode    => '0755',
+    require => Package['unattended-upgrades'],
+  }
+
   $file_content = $config_content ? {
     undef   => template($config_template),
     default => $config_content
-- 
cgit v1.2.3


From 7714aa0436b8cd62982dc6c4f990aec5d33ec852 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 25 Feb 2016 19:59:58 +0100
Subject: Remove loglevel directive from Exec[update_apt]

When using puppet apply (v 3.7), loglevel 'info'
won't show the output on error. This is bad for
debugging.
---
 manifests/init.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 85f44f0..4c44af2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -142,7 +142,6 @@ class apt(
     require     => [
       File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ],
       File['/etc/apt/sources.list'] ],
-    loglevel    => 'info',
     refreshonly => true,
     # Another Semaphor for all packages to reference
     alias       => [ 'apt_updated', 'refresh_apt']
-- 
cgit v1.2.3