Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242787
Change subject: otrs: make Apache redirects XFP-relative
......................................................................
otrs: make Apache redirects XFP-relative
Don't redirect from https to http on the new OTRS server (which sits
behind misc-web).
Change-Id: I0fe4e38c31be4e88400574967ac9616e751fd5ff
---
M modules/otrs/templates/ticket.wikimedia.org.erb
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/242787/1
diff --git a/modules/otrs/templates/ticket.wikimedia.org.erb
b/modules/otrs/templates/ticket.wikimedia.org.erb
index a26a2d5..0c10f1c 100644
--- a/modules/otrs/templates/ticket.wikimedia.org.erb
+++ b/modules/otrs/templates/ticket.wikimedia.org.erb
@@ -122,14 +122,17 @@
#MaxRequestsPerChild 4000
RewriteEngine On
- RewriteRule ^/otrs$ /otrs/index.pl [R=301]
- RewriteRule ^/otrs/$ /otrs/index.pl [R=301]
- RewriteRule ^/$ /otrs/index.pl [R=301]
- RewriteRule /customer.pl /otrs/index.pl [R=301,L]
+ RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
+ RewriteCond %{ENV:RW_PROTO} !=https
+ RewriteRule . - [E=RW_PROTO:http]
+
+ RewriteRule ^/(otrs/?)?$ %{ENV:RW_PROTO}://%{SERVER_NAME}/otrs/index.pl
[R=301]
+ RewriteRule /customer.pl %{ENV:RW_PROTO}://%{SERVER_NAME}/otrs/index.pl
[R=301,L]
# Fix incorrect TicketID links (common on Wikipedia)
RewriteCond %{QUERY_STRING}
^Action=AgentTicketZoom\&TicketID=(200[0-9]{13})$
- RewriteRule ^/otrs/index\.pl
/otrs/index.pl?Action=AgentTicketZoom&TicketNumber=%1 [R]
+ RewriteRule ^/otrs/index\.pl
%{ENV:RW_PROTO}://%{SERVER_NAME}/otrs/index.pl?Action=AgentTicketZoom&TicketNumber=%1
[R]
+
</VirtualHost>
# https://ticket.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/242787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fe4e38c31be4e88400574967ac9616e751fd5ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
