projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move dns info for ubc to hosters.yaml
[mirror/dsa-puppet.git]
/
modules
/
resolv
/
templates
/
resolv.conf.erb
diff --git
a/modules/resolv/templates/resolv.conf.erb
b/modules/resolv/templates/resolv.conf.erb
index
eb59db8
..
8c0166b
100644
(file)
--- a/
modules/resolv/templates/resolv.conf.erb
+++ b/
modules/resolv/templates/resolv.conf.erb
@@
-8,10
+8,7
@@
nameservers = []
searchpaths = []
resolvconf = ''
searchpaths = []
resolvconf = ''
-case hoster
- when "ubcece" then
- searchpaths << "debprivate-ubc.debian.org"
- nameservers += ["206.12.19.5", "137.82.1.1", "142.103.1.1" ]
+case hosterinfo["name"]
when "darmstadt" then
case hostname
when "draghi", "liszt" then
when "darmstadt" then
case hostname
when "draghi", "liszt" then
@@
-19,6
+16,12
@@
case hoster
end
nameservers += ["82.195.75.81", "82.195.66.249", "217.198.242.225"]
searchpaths << "debprivate-darmstadt.debian.org"
end
nameservers += ["82.195.75.81", "82.195.66.249", "217.198.242.225"]
searchpaths << "debprivate-darmstadt.debian.org"
+ when "dgi" then
+ case hostname
+ when "widor" then
+ nameserver << "127.0.0.1"
+ end
+ nameservers += ["195.49.152.215", "195.49.152.213", "195.49.152.214"]
when "ftcollins" then
case hostname
when "spohr", "samosa" then
when "ftcollins" then
case hostname
when "spohr", "samosa" then
@@
-26,8
+29,16
@@
case hoster
end
nameservers += ["192.25.206.33", "192.25.206.57"]
searchpaths << "debprivate-ftcollins.debian.org"
end
nameservers += ["192.25.206.33", "192.25.206.57"]
searchpaths << "debprivate-ftcollins.debian.org"
+ when "grnet" then
+ nameservers += ["194.177.210.10", "194.177.210.210"]
+ searchpaths << "debprivate-grnet.debian.org"
+ when "osousl" then
+ nameserver += ["140.211.166.130","140.211.166.131"]
end
end
+nameservers += hosterinfo['nameservers'] if hosterinfo['nameservers']
+searchpaths += hosterinfo['searchpaths'] if hosterinfo['searchpaths']
+
searchpaths << "debian.org"
if nameservers.empty?
searchpaths << "debian.org"
if nameservers.empty?