Mark Bergsma has submitted this change and it was merged.
Change subject: Configure the misc varnish cluster for gitblit
......................................................................
Configure the misc varnish cluster for gitblit
Change-Id: I83355949402f33d0572e3011ccd7f64e1748fcd6
---
M manifests/role/cache.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index a59b1ab..643e00b 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1136,7 +1136,9 @@
'cache4xx' => '1m',
'layer' => 'frontend',
'ssl_proxies' => $wikimedia_networks,
+ 'default_backend' => 'antimony', # FIXME
},
+ backends => [ 'antimony.wikimedia.org' ],
backend_options => {
'port' => 80,
'connect_timeout' => '5s',
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index e69de29..39733de 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -0,0 +1,8 @@
+sub vcl_recv {
+ if (req.http.Host == "git.wikimedia.org") {
+ set req.backend = antimony;
+ /* gitblit requires the following request headers: */
+ set req.http.X-Forwarded-Proto = "https";
+ set req.http.X-Forwarded-Port = "443";
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/78262
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83355949402f33d0572e3011ccd7f64e1748fcd6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
