diff options
| author | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2010-11-05 14:47:31 +0100 |
|---|---|---|
| committer | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2010-11-05 14:47:31 +0100 |
| commit | 98407bfa96e8600d82abf24ef95d91a6ff911c4d (patch) | |
| tree | df332638a6ff3f9193117e96d0c83d16a6e60f89 /templates | |
| parent | d5c5782194f3623332d61bc856727d52d3621149 (diff) | |
| download | puppet-dhcp-98407bfa96e8600d82abf24ef95d91a6ff911c4d.tar.gz puppet-dhcp-98407bfa96e8600d82abf24ef95d91a6ff911c4d.tar.bz2 | |
(dhcp::server and associated erb) updated documentation and template
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/dhcpd.conf.debian.erb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/templates/dhcpd.conf.debian.erb b/templates/dhcpd.conf.debian.erb index 8cd3183..7606c0c 100644 --- a/templates/dhcpd.conf.debian.erb +++ b/templates/dhcpd.conf.debian.erb @@ -10,13 +10,6 @@ ddns-update-style <%=dhcpd_ddns_update%>; 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_authoritative') -%> @@ -25,6 +18,10 @@ authoritative; #authoritative; <% end -%> +<% if dhcpd_opts and not dhcpd_opts.empty? -%> +<%= dhcpd_opts.collect! {|i| "#{i}" }.join(";\n") %> +<% 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; |