Faidon has submitted this change and it was merged.
Change subject: Set X-Forwarded-(Port|Proto) so Gitblit knows its on SSL
......................................................................
Set X-Forwarded-(Port|Proto) so Gitblit knows its on SSL
Change-Id: Ic7141217bdce6ceaa6a5fcfbec6f321bcd1259f8
---
M manifests/misc/gitblit.pp
M templates/apache/sites/git.wikimedia.org.erb
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/gitblit.pp b/manifests/misc/gitblit.pp
index 0e5d160..2db1974 100644
--- a/manifests/misc/gitblit.pp
+++ b/manifests/misc/gitblit.pp
@@ -29,6 +29,7 @@
}
apache_site { git: name => "git.wikimedia.org" }
+ apache_module { headers: name => "headers" }
apache_module { rewrite: name => "rewrite" }
apache_module { proxy: name => "proxy" }
apache_module { proxy_http: name => "proxy_http" }
diff --git a/templates/apache/sites/git.wikimedia.org.erb
b/templates/apache/sites/git.wikimedia.org.erb
index a9008fc..a3f22fe 100644
--- a/templates/apache/sites/git.wikimedia.org.erb
+++ b/templates/apache/sites/git.wikimedia.org.erb
@@ -48,6 +48,9 @@
SSLCertificateKeyFile /etc/ssl/private/<%= ssl_cert_key %>.key
SSLCACertificatePath /etc/ssl/certs/
+ RequestHeader set X-Forwarded-Proto https
+ RequestHeader set X-Forwarded-Port 443
+
SetEnvIf User-Agent 80legs bad_browser
SetEnvIf User-Agent bingbot bad_browser
--
To view, visit https://gerrit.wikimedia.org/r/61050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7141217bdce6ceaa6a5fcfbec6f321bcd1259f8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <ch...@wikimedia.org>
Gerrit-Reviewer: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: Jeremyb <jer...@tuxmachine.com>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
