Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/123149
Change subject: Tools: Alias tools.wmflabs.org to internal webproxy
......................................................................
Tools: Alias tools.wmflabs.org to internal webproxy
The (external) IP for tools.wmflabs.org is not accessible from within
Labs. To work around that, this change creates an alias that points
to tools-webproxy.
Change-Id: Iff526cccf1b5e887da02e32de15339c9c94215d1
---
M modules/toollabs/manifests/init.pp
1 file changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/123149/1
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 6fa1943..ee19829 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -136,4 +136,22 @@
force => true,
target => "${store}/mail",
}
+
+ # The (external) IP for tools.wmflabs.org is not accessible from
+ # within Labs. To work around that, we create an alias that
+ # points to tools-webproxy. Note that dig is called on the
+ # puppetmaster, not the individual instances.
+ $projectdomain = $::instanceproject ? {
+ 'toolsbeta' => 'tools-beta.wmflabs.org',
+ default => 'tools.wmflabs.org',
+ }
+ $webproxyip = chomp(generate('/usr/bin/dig',
+ '+short',
+ $projectdomain))
+ host { "${::instanceproject}-webproxy":
+ ensure => present,
+ host_aliases => ["${::instanceproject}-webproxy.eqiad.wmflabs",
+ $projectdomain],
+ ip => $webproxyip,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/123149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff526cccf1b5e887da02e32de15339c9c94215d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
