From bff43add032deea4b335836ef105958a7e7d6659 Mon Sep 17 00:00:00 2001
From: Cédric Jeanneret <cedric.jeanneret@camptocamp.com>
Date: Thu, 4 Nov 2010 14:12:39 +0100
Subject: We do not need a special conf for squeeze/lenny

---
 templates/dhcpd.conf.debian.erb  | 31 +++++++++++++++++++++++++++++++
 templates/dhcpd.conf.squeeze.erb | 31 -------------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 templates/dhcpd.conf.debian.erb
 delete mode 100644 templates/dhcpd.conf.squeeze.erb

(limited to 'templates')

diff --git a/templates/dhcpd.conf.debian.erb b/templates/dhcpd.conf.debian.erb
new file mode 100644
index 0000000..865c04c
--- /dev/null
+++ b/templates/dhcpd.conf.debian.erb
@@ -0,0 +1,31 @@
+# File managed by puppet
+
+# The ddns-updates-style parameter controls whether or not the server will
+# attempt to do a DNS update when a lease is confirmed. We default to the
+# behavior of the version 2 packages ('none', since DHCP v2 didn't
+# have support for DDNS.)
+<% if has_variable?('dhcpd_ddns_update') -%>
+ddns-update-style <%=dhcpd_ddns_update%>;
+<% else -%>
+ddns-update-style none;
+<% end -%>
+
+# option definitions common to all supported networks...
+option domain-name "<%=dhcpd_domain_name%>";
+option domain-name-servers <%=dhcpd_dns_servers%>;
+
+default-lease-time 600;
+max-lease-time 7200;
+
+# If this DHCP server is the official DHCP server for the local
+# network, the authoritative directive should be uncommented.
+<% if has_variable?('dhcpd_ddns_authoritative') -%>
+authoritative;
+<% else -%>
+#authoritative;
+<% end -%>
+
+# Use this to send dhcp log messages to a different log file (you also
+# have to hack syslog.conf to complete the redirection).
+log-facility local7;
+
diff --git a/templates/dhcpd.conf.squeeze.erb b/templates/dhcpd.conf.squeeze.erb
deleted file mode 100644
index 865c04c..0000000
--- a/templates/dhcpd.conf.squeeze.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-# File managed by puppet
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-<% if has_variable?('dhcpd_ddns_update') -%>
-ddns-update-style <%=dhcpd_ddns_update%>;
-<% else -%>
-ddns-update-style none;
-<% end -%>
-
-# option definitions common to all supported networks...
-option domain-name "<%=dhcpd_domain_name%>";
-option domain-name-servers <%=dhcpd_dns_servers%>;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-<% if has_variable?('dhcpd_ddns_authoritative') -%>
-authoritative;
-<% else -%>
-#authoritative;
-<% end -%>
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-- 
cgit v1.2.3