summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-07 10:36:12 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-07 10:36:12 -0400
commit48bf4a390e7fc2d7fa948ca1c441785880f4c22b (patch)
treed45e7a8bb259dc737efe6fb073d6d38825a88021 /manifests
parentcc53ce119f5b9b239bc1b8cdcaae6a668b8d1f8c (diff)
Merge Debian squeeze, wheezy, jessie and sid preferences templates into one
Diffstat (limited to 'manifests')
-rw-r--r--manifests/preferences.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index 9ed24c1..50ca23a 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -2,7 +2,10 @@ class apt::preferences {
$pref_contents = $apt::custom_preferences ? {
'' => $::operatingsystem ? {
- 'debian' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
+ 'debian' => $::debian_codename ? {
+ 'lenny' => template("apt/${::operatingsystem}/preferences_lenny.erb"),
+ default => template("apt/${::operatingsystem}/preferences.erb"),
+ },
'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
},
default => $apt::custom_preferences