diff options
| author | varac <varacanero@zeromail.org> | 2013-04-14 13:24:58 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-04-14 13:24:58 +0200 |
| commit | 1ff5a86f5922df3de9a2bcc4b02f8925a7ef17ec (patch) | |
| tree | d2d818ed0a728da102ae9a25268234a60122fde1 | |
| parent | 35c6660d2031c574eb576b9cf5aa5efe9218af98 (diff) | |
| parent | 46c58b07bfd6d6d6ed4bc4139ed4fd14bfe8ada3 (diff) | |
| download | puppet-apt-1ff5a86f5922df3de9a2bcc4b02f8925a7ef17ec.tar.gz puppet-apt-1ff5a86f5922df3de9a2bcc4b02f8925a7ef17ec.tar.bz2 | |
Merge branch 'master' of labs.riseup.net:shared-apt into nadir_master
| -rw-r--r-- | manifests/init.pp | 26 | ||||
| -rw-r--r-- | manifests/params.pp | 17 |
2 files changed, 30 insertions, 13 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 5722c6a..3f8e1c8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,19 +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 -){ + $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 ? { diff --git a/manifests/params.pp b/manifests/params.pp new file mode 100644 index 0000000..b210ff6 --- /dev/null +++ b/manifests/params.pp @@ -0,0 +1,17 @@ +class apt::params () { + $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 = $::lsbdistcodename ? { + 'wheezy' => $debian_url, + default => '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 +} |