Merge remote-tracking branch 'lelutin-gitlab/backports_follow_debian_url' into shared-master

5 files changed, 25 insertions, 23 deletions

diff --git a/README.md b/README.md
index 5f6a109..f6a0c4a 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,10 @@ Ubuntu support is lagging behind but not absent either.
 
 ## Upgrade Notice<a name="upgrade-notice"></a>
 
+ * The default value of the `$repos` parameter was removed since the logic is
+   now in the `apt::params` class. If you have explicitly set `$repos` to
+   'auto' in your manifests, you should remove this.
+
  * 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.
diff --git a/manifests/init.pp b/manifests/init.pp
index 4c44af2..46e5cb0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,19 +20,10 @@ class apt(
   $custom_sources_list = '',
   $custom_key_dir = $apt::params::custom_key_dir
 ) inherits apt::params {
-  case $::operatingsystem {
-    'debian': {
-      $real_repos = $repos ? {
-        'auto'  => 'main contrib non-free',
-        default => $repos,
-      }
-    }
-    'ubuntu': {
-      $real_repos = $repos ? {
-        'auto'  => 'main restricted universe multiverse',
-        default => $repos,
-      }
-    }
+
+  $real_backports_url = $backports_url ? {
+    false   => $debian_url,
+    default => $backports_url,
   }
 
   package { 'apt':
@@ -99,12 +90,12 @@ class apt(
   if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
     apt::sources_list {
       'backports':
-        content => "deb $backports_url ${::debian_codename}-backports ${apt::real_repos}",
+        content => "deb ${real_backports_url} ${::debian_codename}-backports ${apt::repos}",
     }
     if $include_src {
       apt::sources_list {
         'backports-src':
-          content => "deb-src $backports_url ${::debian_codename}-backports ${apt::real_repos}",
+          content => "deb-src ${real_backports_url} ${::debian_codename}-backports ${apt::repos}",
       }
     }
   }
diff --git a/manifests/params.pp b/manifests/params.pp
index 28af06e..a70dac1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -9,14 +9,21 @@ class apt::params () {
   $ubuntu_url = 'http://archive.ubuntu.com/ubuntu'
   $backports_url = $::debian_codename ? {
     'squeeze'  => 'http://backports.debian.org/debian-backports/',
-    default => $::operatingsystem ? {
-      'Ubuntu' => $ubuntu_url,
-      default  => $debian_url,
-    }
+    default => false,
   }
   $lts_url = $debian_url
   $volatile_url = 'http://volatile.debian.org/debian-volatile/'
-  $repos = 'auto'
+  case $::operatingsystem {
+    'debian': {
+      $repos = 'main contrib non-free'
+    }
+    'ubuntu': {
+      $repos = 'main restricted universe multiverse'
+    }
+    default: {
+      fail("Unsupported system '${::operatingsystem}'.")
+    }
+  }
   $custom_preferences = ''
   $custom_key_dir = false
 }
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 44eea53..c7318a2 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -4,7 +4,7 @@
 ### Debian current: <%= codename=scope.lookupvar('::debian_codename') %>
 
 # basic
-deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
+deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::repos') %>
 <% if include_src=scope.lookupvar('apt::include_src')  -%>
 deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 <% end -%>
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index e6d2f64..b90b8c8 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -1,8 +1,8 @@
 # This file is managed by puppet
 # all local modifications will be overwritten
 
-# basic <%= codename=scope.lookupvar('::ubuntu_codename') %>
-deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
+# basic <%= codename=scope.lookupvar('apt::codename') %>
+deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::repos') %>
 <% if include_src=scope.lookupvar('apt::include_src') -%>
 deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %>
 <% end -%>