Ori.livneh has submitted this change and it was merged.
Change subject: debug_proxy: add resolver param and set it to $::nameservers
......................................................................
debug_proxy: add resolver param and set it to $::nameservers
Change-Id: I9b1707f0bbcb940489f67b776b4ad7fe1b0ff859
---
M manifests/role/debug_proxy.pp
M modules/debug_proxy/manifests/init.pp
M modules/debug_proxy/templates/debug_proxy.nginx.erb
3 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/debug_proxy.pp b/manifests/role/debug_proxy.pp
index 1192317..a4d2ad1 100644
--- a/manifests/role/debug_proxy.pp
+++ b/manifests/role/debug_proxy.pp
@@ -14,5 +14,6 @@
class { '::debug_proxy':
backend_regexp => '^mw[12]017',
backend_aliases => { '1' => 'mw1017.eqiad.wmnet' },
+ resolver => join($::nameservers, ' '),
}
}
diff --git a/modules/debug_proxy/manifests/init.pp
b/modules/debug_proxy/manifests/init.pp
index 02356a7..e807117 100644
--- a/modules/debug_proxy/manifests/init.pp
+++ b/modules/debug_proxy/manifests/init.pp
@@ -14,6 +14,10 @@
# If the value of X-Wikimedia-Debug is equal to a defined alias,
# the alias's target will be used as the backend address.
#
+# [*resolver*]
+# Value to set as Nginx's 'resolver'.
+# See <http://nginx.org/en/docs/http/ngx_http_core_module.html#resolver>
+#
# === Examples
#
# Allow requests to select mw1017 / mw1018 / mw1019 explicitly,
@@ -27,6 +31,7 @@
class debug_proxy(
$backend_regexp,
$backend_aliases,
+ $resolver,
) {
nginx::site { 'debug_proxy':
content => template('debug_proxy/debug_proxy.nginx.erb'),
diff --git a/modules/debug_proxy/templates/debug_proxy.nginx.erb
b/modules/debug_proxy/templates/debug_proxy.nginx.erb
index 81802a4..90a9a29 100644
--- a/modules/debug_proxy/templates/debug_proxy.nginx.erb
+++ b/modules/debug_proxy/templates/debug_proxy.nginx.erb
@@ -13,6 +13,7 @@
server_name _;
access_log /var/log/nginx/debug_proxy_access.log;
error_log /var/log/nginx/debug_proxy_error.log;
+ resolver <%= @resolver %>;
location / {
if ($debug_backend = invalid) {
--
To view, visit https://gerrit.wikimedia.org/r/275679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b1707f0bbcb940489f67b776b4ad7fe1b0ff859
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
