Jgreen has uploaded a new change for review. https://gerrit.wikimedia.org/r/77914
Change subject: tweak apache vhost conf for otrs ...................................................................... tweak apache vhost conf for otrs Change-Id: Ifad8ee254844a840434cff2ae7a39d74a9d6be1d --- M files/apache/sites/ticket.wikimedia.org 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/77914/1 diff --git a/files/apache/sites/ticket.wikimedia.org b/files/apache/sites/ticket.wikimedia.org index f765084..1a5650b 100644 --- a/files/apache/sites/ticket.wikimedia.org +++ b/files/apache/sites/ticket.wikimedia.org @@ -16,6 +16,7 @@ # https://ticket.wikimedia.org <VirtualHost *:443> ServerName ticket.wikimedia.org + ServerAlias iodine.wikimedia.org SSLEngine On SSLProtocol -ALL +SSLv3 +TLSv1 @@ -32,15 +33,14 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/" # Setup environment and preload modules - Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl + PerlRequire /opt/otrs/scripts/apache2-perl-startup.pl # Reload Perl modules when changed on disk - PerlModule Apache2::Reload - PerlInitHandler Apache2::Reload + #PerlModule Apache2::Reload + #PerlInitHandler Apache2::Reload # general mod_perl2 options <Location /otrs> - #ErrorDocument 403 /otrs/customer.pl ErrorDocument 403 /otrs/index.pl SetHandler perl-script PerlResponseHandler ModPerl::Registry @@ -83,7 +83,7 @@ Header set Cache-Control "max-age=2592000 must-revalidate" </FilesMatch> </Directory> - + <Directory "/opt/otrs/var/httpd/htdocs/js/js-cache"> <FilesMatch "\.(js|JS)$"> Header set Cache-Control "max-age=2592000 must-revalidate" @@ -94,4 +94,13 @@ # Limit the number of requests per child to avoid excessive memory usage #MaxRequestsPerChild 4000 + RewriteEngine On + RewriteRule ^/otrs$ /otrs/index.pl [R=301] + RewriteRule ^/otrs/$ /otrs/index.pl [R=301] + RewriteRule ^/$ /otrs/index.pl [R=301] + + # 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] + </VirtualHost> -- To view, visit https://gerrit.wikimedia.org/r/77914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifad8ee254844a840434cff2ae7a39d74a9d6be1d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jgreen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
