diff options
author | Varac <varac@leap.se> | 2017-06-27 13:57:43 +0200 |
---|---|---|
committer | Varac <varac@leap.se> | 2017-06-27 13:57:43 +0200 |
commit | 3bed48fba6ae35813b8c4413887aba5262c43689 (patch) | |
tree | 75595f81892da069002af27f361c41ac6381cd96 /manifests/params.pp | |
parent | 5d001efb65f4ac2afa39d17b7b62d4f861f450a3 (diff) | |
parent | f3db3309f3a3fc5ee0f621593ed83805798f7890 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/params.pp')
-rw-r--r-- | manifests/params.pp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 2b18eb5..3879c81 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,14 +1,16 @@ class apt::params () { - $use_lts = false - $use_volatile = false - $use_backports = true - $include_src = false - $use_next_release = false - $debian_url = 'http://httpredir.debian.org/debian/' - $security_url = 'http://security.debian.org/' - $ubuntu_url = 'http://archive.ubuntu.com/ubuntu' - $lts_url = $debian_url - $volatile_url = 'http://volatile.debian.org/debian-volatile/' + $use_lts = false + $use_volatile = false + $use_backports = true + $include_src = false + $use_next_release = false + $manage_preferences = true + $custom_preferences = undef + $debian_url = 'http://httpredir.debian.org/debian/' + $security_url = 'http://security.debian.org/' + $ubuntu_url = 'http://archive.ubuntu.com/ubuntu' + $lts_url = $debian_url + $volatile_url = 'http://volatile.debian.org/debian-volatile/' case $::operatingsystem { 'debian': { $repos = 'main contrib non-free' @@ -20,6 +22,5 @@ class apt::params () { fail("Unsupported system '${::operatingsystem}'.") } } - $custom_preferences = '' $custom_key_dir = false } |