summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-06-08 12:16:46 -0300
committermh <mh@immerda.ch>2012-06-08 12:16:46 -0300
commitac166366d7baa45b74e09974289d9fb2dad38e67 (patch)
tree70cc957e8bafd162eb6d378efbc647e3b837a42d /manifests
parent39917fb4dbe21b1673ceabaa1d61180cca9f493b (diff)
refactor things for >2.7
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp10
-rw-r--r--manifests/preferences.pp4
2 files changed, 6 insertions, 8 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 4a4b178..a015fc9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,7 +6,7 @@
class apt(
$use_volatile = hiera('apt_volatile_enabled',false),
$include_src = hiera('apt_include_src',false),
- $use_next_release = hiera('apt_use_next_release'),
+ $use_next_release = hiera('apt_use_next_release',false),
$debian_url = hiera('apt_debian_url','http://cdn.debian.net/debian/'),
$security_url = hiera('apt_security_url','http://security.debian.org/'),
$backports_url = hiera('apt_backports_url','http://backports.debian.org/debian-backports/'),
@@ -40,16 +40,14 @@ class apt(
# init $release, $next_release, $codename, $next_codename, $release_version
case $::lsbdistcodename {
'': {
- $codename = $::lsbdistcodename
$release = $::lsbdistrelease
}
default: {
- $codename = $::lsbdistcodename
- $release = debian_release($codename)
+ $release = debian_release($::lsbdistcodename)
}
}
- $release_version = debian_release_version($codename)
- $next_codename = debian_nextcodename($codename)
+ $release_version = debian_release_version($::lsbdistcodename)
+ $next_codename = debian_nextcodename($::lsbdistcodename)
$next_release = debian_nextrelease($release)
config_file {
diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index dc04713..8f532f8 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -3,8 +3,8 @@ class apt::preferences {
concat::fragment{"apt_preferences_header":
content => $apt::custom_preferences ? {
'' => $::operatingsystem ? {
- 'debian' => template("apt/${::operatingsystem}/preferences_${::codename}.erb"),
- 'ubuntu' => template("apt/${::operatingsystem}/preferences_${::codename}.erb"),
+ 'debian' => template("apt/${::operatingsystem}/preferences_${::lsbdistcodename}.erb"),
+ 'ubuntu' => template("apt/${::operatingsystem}/preferences_${::lsbdistcodename}.erb"),
},
default => $custom_preferences
},