From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 6 Nov 2011 09:51:17 +0000 (+0100)
Subject: probably break more release dependent things
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2154688028bed791732c2000498f1d9fcfe64d5f;p=mirror%2Fdsa-puppet.git

probably break more release dependent things
---

diff --git a/manifests/site.pp b/manifests/site.pp
index baba96b6a..0cd194048 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,8 +45,9 @@ node default {
                 }
                 default: {
                     package { acpid: ensure => installed }
-                    case getfromhash($nodeinfo, 'squeeze') {
-                        true:  { package { acpi-support-base: ensure => installed } }
+                    case $lsbdistcodename {
+                        'lenny':    { }
+                        default:    { package { acpi-support-base: ensure => installed } }
                     }
                 }
             }
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 51bcde7ac..3636c7367 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -169,9 +169,8 @@ class debian-proliant inherits debian-org {
         "hp-health": ensure => installed;
         "arrayprobe": ensure => installed;
     }
-    case getfromhash($nodeinfo, 'squeeze') {
-        true: {}
-        default: {
+    case $lsbdistcodename {
+        'lenny':    {
             package {
                 "cpqarrayd": ensure => installed;
             }
diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
index da4ec0d08..18c44fbeb 100644
--- a/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
@@ -3,8 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
-deb	http://mirror.netcologne.de/debian-backports/	squeeze-backports main contrib non-free
-<% else %>
-deb	http://mirror.netcologne.de/debian-backports/	lenny-backports main contrib non-free
+<% if lsbdistcodename != 'n/a' %>
+deb	http://backports.debian.org/debian-backports/	<%= lsbdistcodename %>-backports main contrib non-free
 <% end %>
diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
index 05fdc5ae4..6b911c56f 100644
--- a/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
@@ -3,8 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
-deb     http://security.debian.org/             squeeze/updates    main contrib non-free
-<% else %>
-deb     http://security.debian.org/             lenny/updates    main contrib non-free
+<% if lsbdistcodename != 'n/a' %>
+deb     http://security.debian.org/     <%= lsbdistcodename %>/updates    main contrib non-free
 <% end %>
diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
index d64eb30f1..31019200c 100644
--- a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
@@ -3,8 +3,8 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
-deb	http://ftp.debian.org/debian	squeeze-updates		main contrib non-free
-<% else %>
+<% if lsbdistcodename == 'lenny' %>
 deb     http://volatile.debian.org/debian-volatile lenny/volatile   main contrib non-free
+<% elsif lsbdistcodename != 'n/a' %>
+deb	http://ftp.debian.org/debian	<%= lsbdistcodename %>-updates		main contrib non-free
 <% end %>