opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make custom_sources_list into a class paramter

Browse source 
and thus remove the last global variable.
This commit is contained in:
Gabriel Filion 2013-07-27 06:14:47 -04:00
parent 1a72a99693
commit c99227ad55
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
README
View file

@ -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 host. (example: site_apt/files/some.host.com/03clean, or
site_apt/files/some.host.com/03clean_vserver) 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 Classes
======= =======
@ -214,6 +198,18 @@ Class parameters:
class { 'apt': custom_preferences => false } 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 * codename
Contains the codename ("squeeze", "wheezy", ...) of the client's release. While Contains the codename ("squeeze", "wheezy", ...) of the client's release. While

5
manifests/init.pp
View file

@ -15,6 +15,7 @@ class apt(
$ubuntu_url = $apt::params::ubuntu_url, $ubuntu_url = $apt::params::ubuntu_url,
$repos = $apt::params::repos, $repos = $apt::params::repos,
$custom_preferences = $apt::params::custom_preferences, $custom_preferences = $apt::params::custom_preferences,
$custom_sources_list = '',
$disable_update = $apt::params::disable_update, $disable_update = $apt::params::disable_update,
$custom_key_dir = $apt::params::custom_key_dir $custom_key_dir = $apt::params::custom_key_dir
) inherits apt::params { ) inherits apt::params {
@ -53,9 +54,9 @@ class apt(
$next_codename = debian_nextcodename($codename) $next_codename = debian_nextcodename($codename)
$next_release = debian_nextrelease($release) $next_release = debian_nextrelease($release)
$sources_content = $::custom_sources_list ? { $sources_content = $custom_sources_list ? {
'' => template( "apt/${::operatingsystem}/sources.list.erb"), '' => template( "apt/${::operatingsystem}/sources.list.erb"),
default => $::custom_sources_list default => $custom_sources_list
} }
file { file {
# include main, security and backports # include main, security and backports