diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-05-20 18:08:15 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-05-20 18:08:15 -0300 |
commit | 7c548c9878a5e0cecca771a6b7a739af98c21f4e (patch) | |
tree | 03608d69b10bd1d8c35b648edc6da0b546726768 /manifests/init.pp | |
parent | ee15eb570d941ac4113bfad37a539a7e3636f8d2 (diff) | |
parent | c38be6cb7c2cbd53a133291b2750d053877ebe4f (diff) | |
download | puppet-apt-7c548c9878a5e0cecca771a6b7a739af98c21f4e.tar.gz puppet-apt-7c548c9878a5e0cecca771a6b7a739af98c21f4e.tar.bz2 |
Merge branch 'master' of ssh://labs.riseup.net/shared-apt
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 17d87c7..c5afb2b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,20 +4,19 @@ # See LICENSE for the full license granted to you. class apt( - $codename = $::lsbdistcodename, - $use_volatile = false, - $include_src = false, - $use_next_release = false, - $debian_url = 'http://http.debian.net/debian/', - $security_url = 'http://security.debian.org/', - $backports_url = 'http://backports.debian.org/debian-backports/', - $volatile_url = 'http://volatile.debian.org/debian-volatile/', - $ubuntu_url = 'http://archive.ubuntu.com/ubuntu', - $repos = 'auto', - $custom_preferences = '', - $disable_update = false, - $custom_key_dir = false -){ + $codename = $apt::params::codename, + $use_volatile = $apt::params::use_volatile, + $include_src = $apt::params::include_src, + $use_next_release = $apt::params::use_next_release, + $debian_url = $apt::params::debian_url, + $security_url = $apt::params::security_url, + $backports_url = $apt::params::backports_url, + $volatile_url = $apt::params::volatile_url, + $ubuntu_url = $apt::params::ubuntu_url, + $repos = $apt::params::repos, + $custom_preferences = $apt::params::custom_preferences, + $disable_update = $apt::params::disable_update +) inherits apt::params { case $::operatingsystem { 'debian': { $real_repos = $repos ? { |