Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/201448
Change subject: Add resolv.conf alternates for new dns server. ...................................................................... Add resolv.conf alternates for new dns server. Change-Id: I62b1c21085837507fa57ab1a406d1dc901689db8 --- M modules/base/templates/resolv.conf.labs.erb 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/201448/1 diff --git a/modules/base/templates/resolv.conf.labs.erb b/modules/base/templates/resolv.conf.labs.erb index 87962fb..b26ecb0 100644 --- a/modules/base/templates/resolv.conf.labs.erb +++ b/modules/base/templates/resolv.conf.labs.erb @@ -3,7 +3,13 @@ ## source: modules/base/resolv.conf.labs.erb ## from: base::resolving +<% if @use_dnsmasq == true then -%> domain <%= @site %>.wmflabs search <%= @site %>.wmflabs labs.<%= @site %>.wmnet -options timeout:5 ndots:2 nameserver 10.68.16.1 +<% else -%> +domain <%= @instanceproject %>.<%= @site %>.wmflabs +search <%= @instanceproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs +nameserver 208.80.154.12 +<% end -%> +options timeout:5 ndots:2 -- To view, visit https://gerrit.wikimedia.org/r/201448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62b1c21085837507fa57ab1a406d1dc901689db8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
