summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 16:31:42 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 16:31:42 +0100
commitd30069c178ff2aff9154f65bd7dbf988c4d002f1 (patch)
treec710585866e623dd595b35bc921261a364ec64c8 /manifests/init.pp
parentee6d13d1e42acca7374aa302a4f9dfa9001d799f (diff)
parentd97a49b7b2c020c2c43df6524236f50a421789ee (diff)
Merge commit 'd97a49b7b2c020c2c43df6524236f50a421789ee'.
Going on merging immerda changes. Incompatible change: I do prefer my own generic apt/preferences template to shipping a static file that only supports Lenny. My own template supports security, backports, volatile, next release etc. Conflicts: files/preferences manifests/init.pp manifests/preferences.pp
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp26
1 files changed, 10 insertions, 16 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index f55507f..6938c2c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -84,22 +84,16 @@ class apt {
$next_codename = debian_nextcodename($codename)
$next_release = debian_nextrelease($release)
- case $custom_sources_list {
- '': {
- config_file {
- # include main, security and backports
- # additional sources should be included via the custom_sources_template
- # define
- "/etc/apt/sources.list":
- content => template( "apt/$operatingsystem/sources.list.erb"),
- require => Package['lsb'];
- }
- }
- default: {
- config_file { "/etc/apt/sources.list":
- content => $custom_sources_list,
- }
- }
+ config_file {
+ # include main, security and backports
+ # additional sources should be included via the custom_sources_template
+ # define
+ "/etc/apt/sources.list":
+ content => $custom_sources_list ? {
+ '' => template( "apt/$operatingsystem/sources.list.erb"),
+ default => $custom_sources_list
+ },
+ require => Package['lsb'];
}
apt_conf_snippet{ "02show_upgraded":