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

Move default_sources_list into apt class

Browse source 
The contents of the file default_sources_list.pp is used in only one
place. Remove the file and move its contents inside the apt class in
order to have one less useless depth level.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
This commit is contained in:
Gabriel Filion 2010-10-24 07:32:14 -04:00
parent 5bf01f148d
commit e22029433a
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
manifests/default_sources_list.pp
View file

@ -1,11 +0,0 @@
class apt::default_sources_list {
include lsb
config_file {
# include main, security and backports
# additional sources could be included via an array
"/etc/apt/sources.list":
content => template( "apt/$operatingsystem/sources.list.erb"),
require => Package['lsb'];
}
}

12
manifests/init.pp
View file

@ -6,7 +6,7 @@
class apt {
import "custom_sources.pp"
# See README
$real_apt_clean = $apt_clean ? {
'' => 'auto',
@ -18,12 +18,18 @@ class apt {
require => undef,
}
include lsb
case $custom_sources_list {
'': {
include apt::default_sources_list
config_file {
# include main, security and backports
# additional sources could be included via an array
"/etc/apt/sources.list":
content => template( "apt/$operatingsystem/sources.list.erb"),
require => Package['lsb'];
}
}
default: {
include lsb
config_file { "/etc/apt/sources.list":
content => $custom_sources_list,
require => Package['lsb'];