BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392635 )
Change subject: dnsrecursor: send hostname in version responses
......................................................................
dnsrecursor: send hostname in version responses
For both LVS-like and Anycast-like solutions, this makes for
easier debugging of request routing.
Bug: T98006
Change-Id: Id3a82b5fe7dc593e40314be975ef2c9c9c105d30
---
M modules/dnsrecursor/manifests/init.pp
M modules/dnsrecursor/templates/recursor.conf.erb
M modules/profile/manifests/dnsrecursor.pp
3 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/392635/1
diff --git a/modules/dnsrecursor/manifests/init.pp
b/modules/dnsrecursor/manifests/init.pp
index ce7f690..9375905 100644
--- a/modules/dnsrecursor/manifests/init.pp
+++ b/modules/dnsrecursor/manifests/init.pp
@@ -18,6 +18,7 @@
$max_tcp_per_client = 100,
$client_tcp_timeout = 2,
$export_etc_hosts = 'off',
+ $version_hostname = false,
) {
include ::network::constants
diff --git a/modules/dnsrecursor/templates/recursor.conf.erb
b/modules/dnsrecursor/templates/recursor.conf.erb
index a70838a..2c8927c 100644
--- a/modules/dnsrecursor/templates/recursor.conf.erb
+++ b/modules/dnsrecursor/templates/recursor.conf.erb
@@ -108,6 +108,11 @@
# useful for debugging
export-etc-hosts=<%= @export_etc_hosts %>
+<% if @version_hostname -%>
+# Use version-string to query the server hostname under LVS and/or anycast
+version-string=<%= @hostname %>
+<% end -%>
+
<% if @pdns_rec_ver == '4' -%>
# This prevents pdns from polling a public server to check for sec fixes
security-poll-suffix=
@@ -153,7 +158,4 @@
# spoof-nearmiss-max If non-zero, assume spoofing after this many near misses
# spoof-nearmiss-max=20
-
-# version-string string reported on version.pdns or version.bind
-# version-string=PowerDNS Recursor 3.1 $Id: pdns_recursor.cc 838 2006-05-19
14:35:27Z
<% end -%>
diff --git a/modules/profile/manifests/dnsrecursor.pp
b/modules/profile/manifests/dnsrecursor.pp
index 18ff727..4095afc 100644
--- a/modules/profile/manifests/dnsrecursor.pp
+++ b/modules/profile/manifests/dnsrecursor.pp
@@ -6,6 +6,7 @@
include ::lvs::configuration
class { '::dnsrecursor':
+ version_hostname => true,
allow_from => $network::constants::all_networks,
listen_addresses => [
$facts['ipaddress'],
--
To view, visit https://gerrit.wikimedia.org/r/392635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3a82b5fe7dc593e40314be975ef2c9c9c105d30
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
