Andrew Bogott has submitted this change and it was merged.
Change subject: Specify region-appropriate dns resolver.
......................................................................
Specify region-appropriate dns resolver.
Why does nginx need this? I've no idea.
Change-Id: Ie0d55084ab723a241886b70955058d46593540d0
---
M manifests/role/labsproxy.pp
M modules/dynamicproxy/manifests/init.pp
M modules/dynamicproxy/templates/proxy.conf
3 files changed, 19 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 2a638d2..6042eb5 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -57,13 +57,27 @@
}
# A dynamic HTTP routing proxy, based on nginx+lua+redis
-class role::dynamicproxy {
+class role::dynamicproxy::pmtpa {
install_certificate{ 'star.wmflabs.org':
privatekey => false
}
class { '::dynamicproxy':
ssl_certificate_name => 'star.wmflabs.org',
- set_xff => true
+ set_xff => true,
+ resolver => '10.4.0.1'
+ }
+ include dynamicproxy::api
+}
+
+# A dynamic HTTP routing proxy, based on nginx+lua+redis
+class role::dynamicproxy::eqiad {
+ install_certificate{ 'star.wmflabs.org':
+ privatekey => false
+ }
+ class { '::dynamicproxy':
+ ssl_certificate_name => 'star.wmflabs.org',
+ set_xff => true,
+ resolver => '10.68.16.1'
}
include dynamicproxy::api
}
diff --git a/modules/dynamicproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
index 1cec799..5865215 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -17,7 +17,8 @@
$ssl_certificate_name=false,
$notfound_servers=[],
$luahandler='domainproxy.lua',
- $set_xff=false
+ $set_xff=false,
+ $resolver,
) {
class { '::redis':
persist => 'aof',
diff --git a/modules/dynamicproxy/templates/proxy.conf
b/modules/dynamicproxy/templates/proxy.conf
index 475e137..763362b 100644
--- a/modules/dynamicproxy/templates/proxy.conf
+++ b/modules/dynamicproxy/templates/proxy.conf
@@ -28,7 +28,7 @@
<%- end -%>
server {
- resolver 10.4.0.1;
+ resolver <%= resolver %>;
listen 80;
--
To view, visit https://gerrit.wikimedia.org/r/118060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0d55084ab723a241886b70955058d46593540d0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
