Merge remote-tracking branch 'shared/master' into bugfix/reboot-required-jessie

1 files changed, 6 insertions, 15 deletions

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}",
       }
     }
   }