projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temporarily hardcode debian.org and end of searchpaths
[mirror/dsa-puppet.git]
/
modules
/
resolv
/
manifests
/
init.pp
diff --git
a/modules/resolv/manifests/init.pp
b/modules/resolv/manifests/init.pp
index
59f3147
..
669fe4c
100644
(file)
--- a/
modules/resolv/manifests/init.pp
+++ b/
modules/resolv/manifests/init.pp
@@
-1,5
+1,13
@@
class resolv {
class resolv {
+ $nameservers = $facts['unbound'] ? {
+ true => ['127.0.0.1'],
+ default => hiera('nameservers'),
+ }
+
+ $searchpaths = hiera('searchpaths')
+ $resolvoptions = hiera('resolvoptions')
+
file { '/etc/resolv.conf':
content => template('resolv/resolv.conf.erb');
}
file { '/etc/resolv.conf':
content => template('resolv/resolv.conf.erb');
}