diff --git a/files/dhclient.conf.debian b/files/dhclient.conf.debian index c942598..1eac762 100644 --- a/files/dhclient.conf.debian +++ b/files/dhclient.conf.debian @@ -1,9 +1,7 @@ option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; send host-name ""; -request subnet-mask, broadcast-address, time-offset, routers, - domain-name, domain-name-servers, domain-search, host-name, - netbios-name-servers, netbios-scope, interface-mtu, - rfc3442-classless-static-routes, ntp-servers, - dhcp6.domain-search, dhcp6.fqdn, - dhcp6.name-servers, dhcp6.sntp-servers; +request subnet-mask, broadcast-address, routers, + interface-mtu, rfc3442-classless-static-routes; supersede domain-name-servers 127.0.0.1; +supersede domain-search ""; +supersede domain-name ""; diff --git a/files/dhclient.conf.redhat b/files/dhclient.conf.redhat new file mode 100644 index 0000000..1eac762 --- /dev/null +++ b/files/dhclient.conf.redhat @@ -0,0 +1,7 @@ +option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; +send host-name ""; +request subnet-mask, broadcast-address, routers, + interface-mtu, rfc3442-classless-static-routes; +supersede domain-name-servers 127.0.0.1; +supersede domain-search ""; +supersede domain-name ""; diff --git a/manifests/init.pp b/manifests/init.pp index e1c3b4e..078d724 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -57,9 +57,11 @@ class unbound ( ensure => present, } - # HPCloud uses dhclient; tell dhclient to use our nameserver instead. - exec { '/usr/bin/printf "\nsupersede domain-name-servers 127.0.0.1;\n" >> /etc/dhcp/dhclient-eth0.conf': - unless => '/bin/grep -q "supersede domain-name-servers" /etc/dhcp/dhclient-eth0.conf' + file { '/etc/dhcp/dhclient-eth0.conf': + source => 'puppet:///modules/unbound/dhclient.conf.redhat', + owner => 'root', + group => 'root', + mode => '0644', } }