Mark Bergsma has submitted this change and it was merged.
Change subject: Connect to gitblit directly, don't run the default VCL for
gitblit
......................................................................
Connect to gitblit directly, don't run the default VCL for gitblit
Change-Id: I8f4a2ec441d2bcbb81f1e1f01b1ed4890bb88243
---
M manifests/role/cache.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 8 insertions(+), 2 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 643e00b..b9de18c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1139,13 +1139,18 @@
'default_backend' => 'antimony', # FIXME
},
backends => [ 'antimony.wikimedia.org' ],
- backend_options => {
+ backend_options => [
+ {
+ 'backend_match' => '^antimoney',
+ 'port' => 8080,
+ },
+ {
'port' => 80,
'connect_timeout' => '5s',
'first_byte_timeout' => '35s',
'between_bytes_timeout' => '4s',
'max_connections' => 100,
- }
+ }]
}
}
}
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 39733de..5aedcf3 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -4,5 +4,6 @@
/* gitblit requires the following request headers: */
set req.http.X-Forwarded-Proto = "https";
set req.http.X-Forwarded-Port = "443";
+ return (lookup);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/78266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f4a2ec441d2bcbb81f1e1f01b1ed4890bb88243
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
