Changeset 512


Ignore:
Timestamp:
Jan 19, 2010, 6:35:59 PM (12 years ago)
Author:
sebas
Message:

areglo del nombre de las variables + nueva seccion en el template para la resolucion de nombre

Location:
trunk/puppet/modules/puppet-dnsmasq
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/puppet/modules/puppet-dnsmasq/manifests/init.pp

    r511 r512  
    66
    77define dnsmasq::config (
    8   $dhcp-authoritative,
    9   $dhcp-range,
    10   $dhcp-option,
    11   $read-ethers
     8  $dhcp_authoritative,
     9  $dhcp_range = 'absent',
     10  $dhcp_option = 'absent',
     11  $read_ethers,
     12  $domain = 'absent'
    1213) {
    1314
     
    1819      owner   => root,
    1920      group   => root,
    20       mode    => 755,
     21      mode    => 644,
    2122      require => Package["dnsmasq"],
    22       notify  => Service["autossh-tunnel-${name}"],
     23      notify  => Service["dnsmasq"],
    2324    }
    2425   
  • trunk/puppet/modules/puppet-dnsmasq/templates/my.dnsmasq.conf.erb

    r511 r512  
    22# dnsmasq dhcpd configuration
    33#
    4 <% if has_variable?("dhcp-authorative") -%>
     4<% if has_variable?("dhcp_authoritative") -%>
    55dhcp-authoritative
    66<% end -%>
    77
    8 <% if dhcp-range != 'absent' -%>
    9 dhcp-range=<%= dhcp-range %>
     8<% if dhcp_range != 'absent' -%>
     9dhcp-range=<%= dhcp_range %>
    1010<% end -%>
    1111
    12 <% if dhcp-option != 'absent' -%>
    13 dhcp-option=<%= 3,10.11.12.1 %>
     12<% if dhcp_option != 'absent' -%>
     13dhcp-option=<%= dhcp_option %>
    1414<% end -%>
    1515
    16 <% if has_variable?("read-ethers") -%>
     16<% if has_variable?("read_ethers") -%>
    1717read-ethers
    1818<% end -%>
     19
     20#
     21# dns configuration
     22#
     23
     24# Never forward plain names (without a dot or domain part)
     25domain-needed
     26# Never forward addresses in the non-routed address spaces.
     27bogus-priv
     28
     29<% if domain != 'absent' -%>
     30# Set this (and domain: see below) if you want to have a domain
     31# automatically added to simple names in a hosts-file.
     32expand-hosts
     33# Set the domain for dnsmasq. this is optional, but if it is set, it
     34# does the following things.
     35# 1) Allows DHCP hosts to have fully qualified domain names, as long
     36#     as the domain part matches this setting.
     37# 2) Sets the "domain" DHCP option thereby potentially setting the
     38#    domain of all systems configured by DHCP
     39# 3) Provides the domain part for "expand-hosts"
     40domain=<%= domain %>
     41<% end -%>
     42
     43
     44
Note: See TracChangeset for help on using the changeset viewer.