diff options
author | varac <varacanero@zeromail.org> | 2015-12-05 20:26:39 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-12-05 20:26:39 +0100 |
commit | b6cb0285053a0ffd23082d7e63a87108ca0e3fbd (patch) | |
tree | a142332e3419df289e9437b6477971276cbc836f /manifests/params.pp | |
parent | ab90d1d0fe9655d367c637e95dff59e4dbe2dd35 (diff) | |
parent | d372562329371c24df889d69ca4d476eda6497e9 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/params.pp')
-rw-r--r-- | manifests/params.pp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index a1c7392..28da13e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,5 +1,4 @@ class apt::params () { - $codename = $::lsbdistcodename $use_lts = false $use_volatile = false $use_backports = true @@ -7,13 +6,16 @@ class apt::params () { $use_next_release = false $debian_url = 'http://httpredir.debian.org/debian/' $security_url = 'http://security.debian.org/' - $backports_url = $::lsbdistcodename ? { + $ubuntu_url = 'http://archive.ubuntu.com/ubuntu' + $backports_url = $::debian_codename ? { 'squeeze' => 'http://backports.debian.org/debian-backports/', - default => $debian_url + default => $::operatingsystem ? { + 'Ubuntu' => $ubuntu_url, + default => $debian_url, + } } $lts_url = $debian_url $volatile_url = 'http://volatile.debian.org/debian-volatile/' - $ubuntu_url = 'http://archive.ubuntu.com/ubuntu' $repos = 'auto' $custom_preferences = '' $disable_update = false |