diff options
| author | Gabriel Filion <gabster@lelutin.ca> | 2013-07-27 06:14:47 -0400 |
|---|---|---|
| committer | Gabriel Filion <gabster@lelutin.ca> | 2013-07-27 06:14:47 -0400 |
| commit | c99227ad55e8d266a77ad5dfb672147eec6e1c3b (patch) | |
| tree | c51d059852bba6748734cca4af6ddd73c57f7c9d | |
| parent | 1a72a99693c1d77bfe891546408f88264fca98ee (diff) | |
| download | puppet-apt-c99227ad55e8d266a77ad5dfb672147eec6e1c3b.tar.gz puppet-apt-c99227ad55e8d266a77ad5dfb672147eec6e1c3b.tar.bz2 | |
Make custom_sources_list into a class paramter
and thus remove the last global variable.
| -rw-r--r-- | README | 28 | ||||
| -rw-r--r-- | manifests/init.pp | 5 |
2 files changed, 15 insertions, 18 deletions
@@ -113,22 +113,6 @@ the site_apt modules' files directory that is named the same as the host. (example: site_apt/files/some.host.com/03clean, or site_apt/files/some.host.com/03clean_vserver) -Variables -========= - -$custom_sources_list --------------------- - -By default this module will use a basic apt/sources.list template with -a generic Debian mirror. If you need to set more specific sources, -e.g. changing the sections included in the source, etc. you can set -this variable to the content that you desire to use instead. - -For example, setting the following variable before including this class will -pull in the templates/site_apt/sources.list file: - - $custom_sources_list = template('site_apt/sources.list') - Classes ======= @@ -214,6 +198,18 @@ Class parameters: class { 'apt': custom_preferences => false } +* custom_sources_list + + By default this module will use a basic apt/sources.list template with + a generic Debian mirror. If you need to set more specific sources, + e.g. changing the sections included in the source, etc. you can set + this variable to the content that you desire to use instead. + + For example, setting this variable will pull in the + templates/site_apt/sources.list file: + + class { 'apt': custom_sources_list => template('site_apt/sources.list') } + * codename Contains the codename ("squeeze", "wheezy", ...) of the client's release. While 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 |