summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2015-12-04 12:33:35 -0500
committerGabriel Filion <gabster@lelutin.ca>2015-12-04 12:36:25 -0500
commitbfa973a66896208e2cf0bea37ec15a4f950f09bd (patch)
tree62f3cf7f3d907c78082caeec5d700aee63dfc878
parent99fe7db72135c8bca025a5870e693689b8803d94 (diff)
Use $ubuntu_url as default value of $backports_url on Ubuntu
Ubuntu shouldn't be using debian backports by default. This was written by Anoine Beaupré, but split from the commit "move backports to snippets" since the change is unrelated and needs to be more visible in the commit history.
-rw-r--r--manifests/params.pp7
1 files changed, 5 insertions, 2 deletions
diff --git a/manifests/params.pp b/manifests/params.pp
index 9c85b6f..28da13e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,13 +6,16 @@ class apt::params () {
$use_next_release = false
$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 => $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