push logic behind apt::repos back in apt::params

The logic in specifying the default value for apt::repos is in the wrong
place: it should be in apt::params since this is exactly what this
latter class is for.

There's no special case that can involve making default the value follow
the value of another parameter so there's no point in having that logic
in the main class.

4 files changed, 14 insertions, 18 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 9c186cc..46e5cb0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,20 +20,6 @@ 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,
diff --git a/manifests/params.pp b/manifests/params.pp
index be7262d..a70dac1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,7 +13,17 @@ class apt::params () {
   }
   $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 -%>