From: Cédric Jeanneret <cedric.jeanneret@camptocamp.com>
Date: Thu, 4 Nov 2010 13:12:39 +0000 (+0100)
Subject: We do not need a special conf for squeeze/lenny
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=bff43add032deea4b335836ef105958a7e7d6659;p=puppet-dhcp.git

We do not need a special conf for squeeze/lenny
---

diff --git a/manifests/classes/dhcp-debian.pp b/manifests/classes/dhcp-debian.pp
index 1d35cbc..af8d592 100644
--- a/manifests/classes/dhcp-debian.pp
+++ b/manifests/classes/dhcp-debian.pp
@@ -9,10 +9,7 @@ This class should not be included as is, please include "dhcp" instead.
 class dhcp::debian inherits dhcp::base {
 
   Common::Concatfilepart["00-base"] {
-    content => $lsbdistcodename ? {
-      squeeze => template('dhcp/dhcpd.conf.squeeze.erb'),
-      lenny   => template('dhcp/dhcpd.conf.lenny.erb'),
-    }
+    content => template('dhcp/dhcpd.conf.squeeze.erb'),
   }
 
   Service["dhcpd"] {
diff --git a/templates/dhcpd.conf.squeeze.erb b/templates/dhcpd.conf.debian.erb
similarity index 100%
rename from templates/dhcpd.conf.squeeze.erb
rename to templates/dhcpd.conf.debian.erb