projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add volumes for mekeel
[mirror/dsa-puppet.git]
/
modules
/
resolv
/
manifests
/
init.pp
diff --git
a/modules/resolv/manifests/init.pp
b/modules/resolv/manifests/init.pp
index
c2a741d
..
9de974a
100644
(file)
--- a/
modules/resolv/manifests/init.pp
+++ b/
modules/resolv/manifests/init.pp
@@
-1,14
+1,28
@@
-class resolv {
+class resolv(
+ Array[Stdlib::IP::Address] $nameservers = [],
+ Array[String] $searchpaths = [],
+ Array[String] $resolvoptions = [],
+) {
-
$nameserver
s = $facts['unbound'] ? {
-
true => ['127.0.0.1'],
-
default => lookup('nameservers')
,
-
}
+
$n
s = $facts['unbound'] ? {
+ true => ['127.0.0.1'],
+
default => $nameservers
,
+ }
- $searchpaths = lookup('resolv_conf::searchpaths')
- $resolvoptions = lookup('resolv_conf::resolvoptions')
+ file { '/etc/resolv.conf':
+ content => template('resolv/resolv.conf.erb');
+ }
- file { '/etc/resolv.conf':
- content => template('resolv/resolv.conf.erb');
- }
+ file { '/etc/dhcp/dhclient-enter-hooks.d/puppet-no-resolvconf':
+ content => @("EOF"),
+ make_resolv_conf() {
+ :
+ }
+ | EOF
+ mode => '555',
+ ensure => ($dhclient and $unbound) ? {
+ true => 'present',
+ false => 'absent',
+ }
+ }
}
}