diff options
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 21e546f..68856cc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,19 +5,21 @@ class apt( $codename = $apt::params::codename, + $use_lts = $apt::params::use_lts, $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, + $lts_url = $apt::params::lts_url, $volatile_url = $apt::params::volatile_url, $ubuntu_url = $apt::params::ubuntu_url, $repos = $apt::params::repos, $custom_preferences = $apt::params::custom_preferences, + $custom_sources_list = '', $disable_update = $apt::params::disable_update, - $custom_key_dir = $apt::params::custom_key_dir, - $custom_sources_list = undef + $custom_key_dir = $apt::params::custom_key_dir ) inherits apt::params { case $::operatingsystem { 'debian': { @@ -54,10 +56,9 @@ class apt( $next_codename = debian_nextcodename($codename) $next_release = debian_nextrelease($release) - if $custom_sources_list == undef { - $sources_content = template( "apt/${::operatingsystem}/sources.list.erb") - } else { - $sources_content = $custom_sources_list + $sources_content = $custom_sources_list ? { + '' => template( "apt/${::operatingsystem}/sources.list.erb"), + default => $custom_sources_list } file { # include main, security and backports @@ -113,8 +114,8 @@ class apt( package { 'debian-backports-keyring': ensure => absent } include common::moduledir + common::module_dir { 'apt': } $apt_base_dir = "${common::moduledir::module_dir_path}/apt" - modules_dir { 'apt': } if $custom_key_dir { file { "${apt_base_dir}/keys.d": |