summaryrefslogtreecommitdiff
path: root/manifests/params.pp
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2015-10-03 01:13:50 -0400
committerGabriel Filion <gabster@lelutin.ca>2016-06-27 15:39:51 +0200
commit770f8fb5dafa442bc018fa95fcab2fb60d817020 (patch)
tree8f8ed54a10c2e0ee2392ff38bb6b8b2741a2e44c /manifests/params.pp
parent8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff)
make backports_url follow debian_url by default
backports_url was already set to the same value than debian_url by default, but it was set to the default value of debian_url. this meant that when giving a url to the debian_url parameter to the apt class, the backports_url would not follow and would still be using the default value for debian_url. with this change, when backports_url is not specified, but debian_url is, then both of them take on the value given to the debian_url. of course if backports_url is also given a value, then it keeps the value given by the user.
Diffstat (limited to 'manifests/params.pp')
-rw-r--r--manifests/params.pp5
1 files changed, 1 insertions, 4 deletions
diff --git a/manifests/params.pp b/manifests/params.pp
index 28af06e..be7262d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -9,10 +9,7 @@ class apt::params () {
$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,
- }
+ default => false,
}
$lts_url = $debian_url
$volatile_url = 'http://volatile.debian.org/debian-volatile/'