From 5ec8ffb4ef1bdb6194d306f4e24b063b83c09982 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 20 Mar 2013 22:09:29 +0100
Subject: Move apt class parameters to a ::params class.

This brings no behaviour change yet, but will allow to set class parameters'
default value depending on system facts.
---
 manifests/init.pp   | 26 +++++++++++++-------------
 manifests/params.pp | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 manifests/params.pp

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 5722c6a..3f8e1c8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,19 +4,19 @@
 # See LICENSE for the full license granted to you.
 
 class apt(
-  $codename = $::lsbdistcodename,
-  $use_volatile = false,
-  $include_src = false,
-  $use_next_release = false,
-  $debian_url = 'http://http.debian.net/debian/',
-  $security_url = 'http://security.debian.org/',
-  $backports_url = 'http://backports.debian.org/debian-backports/',
-  $volatile_url = 'http://volatile.debian.org/debian-volatile/',
-  $ubuntu_url = 'http://archive.ubuntu.com/ubuntu',
-  $repos = 'auto',
-  $custom_preferences = '',
-  $disable_update = false
-){
+  $codename = $apt::params::codename,
+  $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,
+  $volatile_url = $apt::params::volatile_url,
+  $ubuntu_url = $apt::params::ubuntu_url,
+  $repos = $apt::params::repos,
+  $custom_preferences = $apt::params::custom_preferences,
+  $disable_update = $apt::params::disable_update
+) inherits apt::params {
   case $::operatingsystem {
     'debian': {
       $real_repos = $repos ? {
diff --git a/manifests/params.pp b/manifests/params.pp
new file mode 100644
index 0000000..f71570b
--- /dev/null
+++ b/manifests/params.pp
@@ -0,0 +1,14 @@
+class apt::params () {
+  $codename = $::lsbdistcodename
+  $use_volatile = false
+  $include_src = false
+  $use_next_release = false
+  $debian_url = 'http://http.debian.net/debian/'
+  $security_url = 'http://security.debian.org/'
+  $backports_url = 'http://backports.debian.org/debian-backports/'
+  $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 46c58b07bfd6d6d6ed4bc4139ed4fd14bfe8ada3 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 20 Mar 2013 22:11:46 +0100
Subject: Use the main Debian archive's URL as the default URL for backports on
 Wheezy.

The backports are now fully integrated with the main archive.

See:
https://labs.riseup.net/code/issues/4270
https://lists.debian.org/debian-devel-announce/2013/03/msg00007.html
---
 manifests/params.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/params.pp b/manifests/params.pp
index f71570b..b210ff6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,7 +5,10 @@ class apt::params () {
   $use_next_release = false
   $debian_url = 'http://http.debian.net/debian/'
   $security_url = 'http://security.debian.org/'
-  $backports_url = 'http://backports.debian.org/debian-backports/'
+  $backports_url = $::lsbdistcodename ? {
+    'wheezy' => $debian_url,
+    default  => 'http://backports.debian.org/debian-backports/',
+  }
   $volatile_url = 'http://volatile.debian.org/debian-volatile/'
   $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
   $repos = 'auto'
-- 
cgit v1.2.3