Dzahn has submitted this change and it was merged.
Change subject: varnish: git.wm.org to iridium, remove related
config/tests/monitoring
......................................................................
varnish: git.wm.org to iridium, remove related config/tests/monitoring
This changes the backend to iridium so that the rewrites from git.w.o to
phabricator.w.o can be on the same host as phabricator.
This is also removing config and tests that was specifically for gitblit and
should not be needed anymore. It removes the monitoring for git.w.o as
phabricator is already monitored.
Bug:T137224
Depends-On: I67ad308f9e6373e5234cb2d83006457d6f467bf8
Change-Id: Id8dad592e3f16736bc8eb0d6806be1b53feb94fe
---
M manifests/role/icinga.pp
D modules/icinga/manifests/monitor/git.pp
M modules/role/manifests/cache/misc.pp
D modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc
M templates/varnish/misc-frontend.inc.vcl.erb
5 files changed, 2 insertions(+), 51 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index 30ac371..1c1adbd 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -23,7 +23,6 @@
include icinga::monitor::legal
include icinga::monitor::certs
include icinga::monitor::gsb
- include icinga::monitor::git
include icinga::monitor::commons
include lvs::monitor
include role::authdns::monitoring
diff --git a/modules/icinga/manifests/monitor/git.pp
b/modules/icinga/manifests/monitor/git.pp
deleted file mode 100644
index e2b3474..0000000
--- a/modules/icinga/manifests/monitor/git.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# monitoring of git.wikimedia.org
-class icinga::monitor::git {
-
- @monitoring::host { 'git.wikimedia.org':
- host_fqdn => 'git.wikimedia.org'
- }
-
- monitoring::service { 'git.wikimedia.org':
- description => 'git.wikimedia.org',
- check_command =>
'check_http_url!git.wikimedia.org!/tree/mediawiki%2Fvendor.git',
- host => 'git.wikimedia.org',
- contact_group => 'admins',
- }
-
-}
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 32d7932..4b89e6f 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -50,13 +50,6 @@
'be_opts' => merge($app_def_be_opts, { 'port' => 8888 }),
'req_host' => 'hue.wikimedia.org',
},
- 'antimony' => {
- 'dynamic' => 'no',
- 'type' => 'random',
- 'backends' => ['antimony.wikimedia.org'],
- 'be_opts' => merge($app_def_be_opts, { 'port' => 8080 }),
- 'req_host' => 'git.wikimedia.org',
- },
'bromine' => { # ganeti VM for misc. static HTML sites
'dynamic' => 'no',
'type' => 'random',
@@ -136,7 +129,8 @@
'phabricator.wikimedia.org',
'phab.wmfusercontent.org',
'bugzilla.wikimedia.org',
- 'bugs.wikimedia.org'
+ 'bugs.wikimedia.org',
+ 'git.wikimedia.org'
],
},
'krypton' => { # ganeti VM for misc. PHP apps
diff --git a/modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc
b/modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc
deleted file mode 100644
index e09f90d..0000000
--- a/modules/varnish/files/tests/misc/02-git.w.o-x-forwarded.vtc
+++ /dev/null
@@ -1,22 +0,0 @@
-varnishtest "git.wikimedia.org expects X-Forwarded-{Proto,Port}"
-
-server s1 {
- rxreq
- expect req.http.X-Forwarded-Proto == "https"
- expect req.http.X-Forwarded-Port == "443"
- txresp
-} -start
-
-varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend {
- backend vtc_backend {
- .host = "${s1_addr}"; .port = "${s1_port}";
- }
-
- include "/usr/share/varnish/tests/wikimedia_misc-frontend.vcl";
-} -start
-
-client c1 {
- txreq -hdr "Host: git.wikimedia.org" -hdr "X-Forwarded-Proto: https"
- rxresp
- expect resp.status == 200
-} -run
diff --git a/templates/varnish/misc-frontend.inc.vcl.erb
b/templates/varnish/misc-frontend.inc.vcl.erb
index 8a82db3..4d06a60 100644
--- a/templates/varnish/misc-frontend.inc.vcl.erb
+++ b/templates/varnish/misc-frontend.inc.vcl.erb
@@ -15,11 +15,6 @@
unset req.http.X-WEBAUTH-USER;
}
- if (req.http.Host == "git.wikimedia.org") {
- // gitblit requires this and X-F-P:https
- set req.http.X-Forwarded-Port = "443";
- }
-
// STS-preload checker doesn't like [45]xx responses, but 3xx is OK, so
// re-use the TLS-redirector code and send them to the wikimedia site.
if (req.http.Host == "wmfusercontent.org") {
--
To view, visit https://gerrit.wikimedia.org/r/293789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8dad592e3f16736bc8eb0d6806be1b53feb94fe
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
