diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-04-11 14:25:15 +0200 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-04-11 14:25:15 +0200 |
| commit | 65bea20e0d8e61de7519bb1ab0677597500aaac7 (patch) | |
| tree | 89a91f68d8118bc56dbf7da3afe652de3a565dfd /templates | |
| parent | a3158aaca4070a4de89b49d687854d72df8741fe (diff) | |
| download | puppet-dhcp-65bea20e0d8e61de7519bb1ab0677597500aaac7.tar.gz puppet-dhcp-65bea20e0d8e61de7519bb1ab0677597500aaac7.tar.bz2 | |
Get rid of unscoped variables in dhcp::server, fix template
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/dhcpd.conf.debian.erb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/templates/dhcpd.conf.debian.erb b/templates/dhcpd.conf.debian.erb index ee95bee..7dfd168 100644 --- a/templates/dhcpd.conf.debian.erb +++ b/templates/dhcpd.conf.debian.erb @@ -4,22 +4,14 @@ # 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 -%> +ddns-update-style <%= @ddns_update %>; # If this DHCP server is the official DHCP server for the local # network, the authoritative directive should be uncommented. -<% if has_variable?('dhcpd_authoritative') -%> -authoritative; -<% else -%> -#authoritative; -<% end -%> +<% unless @authoritative -%>#<%- end -%>authoritative; -<% if has_variable?('dhcpd_opts') and not dhcpd_opts.empty? -%> -<%= dhcpd_opts.join(";\n") %> +<% unless @opts.empty? -%> +<%= @opts.join(";\n") %>; <% end -%> # Use this to send dhcp log messages to a different log file (you also |