diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 14 | ||||
| -rw-r--r-- | manifests/params.pp | 12 |
2 files changed, 11 insertions, 15 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 } |