Merge remote-tracking branch 'shared/master' into leap_master

1 files changed, 11 insertions, 8 deletions

diff --git a/manifests/params.pp b/manifests/params.pp
index 28af06e..2b18eb5 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,16 +7,19 @@ class apt::params () {
   $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 => $::operatingsystem ? {
-      'Ubuntu' => $ubuntu_url,
-      default  => $debian_url,
-    }
-  }
   $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
 }