diff options
| author | Jérôme Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2016-06-29 16:35:17 +0200 |
|---|---|---|
| committer | Jérôme Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2016-06-29 16:35:17 +0200 |
| commit | 53c49fe2ae7bc74ab01457ffba8a6efd24fd44f9 (patch) | |
| tree | 0f59b2638ae7606e9f42ed94e4d8d46b21d4ce64 /manifests | |
| parent | 5d95c3f5e7d0543d28792a96bb3cd927b265ec71 (diff) | |
| parent | 48bf4a390e7fc2d7fa948ca1c441785880f4c22b (diff) | |
Merge branch 'merge_debian_preferences_templates'
Conflicts:
manifests/preferences.pp
templates/Debian/preferences_jessie.erb
templates/Debian/preferences_squeeze.erb
templates/Debian/preferences_wheezy.erb
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/preferences.pp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 6982ca0..50ca23a 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -2,8 +2,11 @@ class apt::preferences { $pref_contents = $apt::custom_preferences ? { '' => $::operatingsystem ? { - 'debian' => template("apt/${::operatingsystem}/preferences_${::debian_codename}.erb"), - 'ubuntu' => template("apt/${::operatingsystem}/preferences_${::ubuntu_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 } |