diff options
| author | Micah Anderson <micah@riseup.net> | 2014-03-21 12:04:25 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2014-03-21 12:04:25 -0400 |
| commit | 51b69c26619e0bde9a0a67dba7fdae2ca2526363 (patch) | |
| tree | 83304a7df42b024889042ad5a2297cfc2b226bc8 /manifests/init.pp | |
| parent | 082a2f77687b5c9dad63f5b30c672cc495506cd9 (diff) | |
| parent | 128410f64363f717fc0d5a13faf769843a0b733c (diff) | |
| download | puppet-apt-51b69c26619e0bde9a0a67dba7fdae2ca2526363.tar.gz puppet-apt-51b69c26619e0bde9a0a67dba7fdae2ca2526363.tar.bz2 | |
Merge branch 'master' of buse.riseup.net:shared-apt
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 33eac37..7550aaa 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,6 +15,7 @@ class apt( $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 ) inherits apt::params { @@ -53,9 +54,9 @@ class apt( $next_codename = debian_nextcodename($codename) $next_release = debian_nextrelease($release) - $sources_content = $::custom_sources_list ? { + $sources_content = $custom_sources_list ? { '' => template( "apt/${::operatingsystem}/sources.list.erb"), - default => $::custom_sources_list + default => $custom_sources_list } file { # include main, security and backports |