Faidon Liambotis has submitted this change and it was merged.

Change subject: varnish: redirect otrs-test to HTTPS
......................................................................


varnish: redirect otrs-test to HTTPS

Change-Id: Ib0d18b7e765ae97a7bb1f1dc9c00ca97a20c90e9
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 5bffbaa..918a322 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -42,7 +42,15 @@
     } elsif (req.http.Host == "servermon.wikimedia.org") {
         set req.backend = netmon1001;
     } elsif (req.http.Host == "otrs-test.wikimedia.org") {
-        set req.backend = mendelevium;
+        if (req.http.X-Forwarded-Proto != "https") {
+            set req.http.Location = "https://"; + req.http.Host + req.url;
+            // Use a custom 755 error code to indicate internally
+            // that we are forcing a 301 redirect to https.
+            error 755 "TLS Redirect";
+        }
+        else {
+            set req.backend = mendelevium;
+        }
         // No caching of OTRS for now
         return (pass);
     } elsif (req.http.Host == "people.wikimedia.org") {

-- 
To view, visit https://gerrit.wikimedia.org/r/242788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0d18b7e765ae97a7bb1f1dc9c00ca97a20c90e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to