projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
The trick for merge options to work is to use lookup() rather than hiera()
[mirror/dsa-puppet.git]
/
hieradata
/
hosters
/
sanger.yaml
diff --git
a/hieradata/hosters/sanger.yaml
b/hieradata/hosters/sanger.yaml
index
dc25af7
..
fe56acb
100644
(file)
--- a/
hieradata/hosters/sanger.yaml
+++ b/
hieradata/hosters/sanger.yaml
@@
-2,7
+2,7
@@
nameservers:
- 193.62.202.28
- 193.62.202.29
-searchpaths:
+
resolv_conf::
searchpaths:
- debprivate-sanger.debian.org
allow_dns_query:
- 193.62.202.24/29