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
---
 manifests/params.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/params.pp')

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 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(+)

(limited to 'manifests/params.pp')

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 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(-)

(limited to 'manifests/params.pp')

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(-)

(limited to 'manifests/params.pp')

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 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

(limited to 'manifests/params.pp')

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 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(-)

(limited to 'manifests/params.pp')

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 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(-)

(limited to 'manifests/params.pp')

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 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(-)

(limited to 'manifests/params.pp')

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