BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340156 )
Change subject: authdns: re-structure prep for discovery
......................................................................
authdns: re-structure prep for discovery
This must be deployed in sync with the same structure change in
the DNS repo.
Bug: T156100
Change-Id: I062f3583e3d2e6bd96d6f5cc991d04ec55c1e8e2
---
M modules/authdns/templates/config.erb
1 file changed, 23 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/340156/1
diff --git a/modules/authdns/templates/config.erb
b/modules/authdns/templates/config.erb
index 737e01f..eaf6221 100644
--- a/modules/authdns/templates/config.erb
+++ b/modules/authdns/templates/config.erb
@@ -1,19 +1,27 @@
options => {
- listen = any
- http_listen = [ 127.0.0.1, ::1 ],
- zones_strict_data = true,
- zones_default_ttl = 3600,
- # don't inotify on zonefiles but wait for HUP
- zones_rfc1035_auto = false,
+ listen = any
+ http_listen = [ 127.0.0.1, ::1 ],
+ zones_strict_data = true,
+ zones_default_ttl = 3600,
+ # don't inotify on zonefiles but wait for HUP
+ zones_rfc1035_auto = false,
- # Use multiple threads-per-socket, makes handling
- # query-rate spikes even easier.
- # Note this will only take effect on kernels >= 3.9 (trusty),
- # on others it will be bumped back to 1 at runtime by
- # the daemon for lack of SO_REUSEPORT support.
- udp_threads = <%= @physicalcorecount %>
- tcp_threads = <%= @physicalcorecount %>
+ # Use multiple threads-per-socket, makes handling
+ # query-rate spikes even easier.
+ # Note this will only take effect on kernels >= 3.9 (trusty),
+ # on others it will be bumped back to 1 at runtime by
+ # the daemon for lack of SO_REUSEPORT support.
+ udp_threads = <%= @physicalcorecount %>
+ tcp_threads = <%= @physicalcorecount %>
}
-# Include config-geo from authdns repo
-$include{config-geo}
+plugins => {
+ geoip => {
+ maps => {
+ $include{geo-maps},
+ },
+ resources => {
+ $include{geo-resources},
+ },
+ },
+}
--
To view, visit https://gerrit.wikimedia.org/r/340156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I062f3583e3d2e6bd96d6f5cc991d04ec55c1e8e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
