Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/60934
Change subject: add secure.wikimedia.org (old SSL site) redirects to cluster. ...................................................................... add secure.wikimedia.org (old SSL site) redirects to cluster. they are still on singer right now, but that needs to go. the redirect rules are exactly as they are on singer right now. they are a straight copy, what i changed versus the singer config was: - <VirtualHost 208.80.152.134:443> becomes <VirtualHost *> - <VirtualHost 208.80.152.134:80> is dropped. this had a single rule to redirect http to https RewriteRule ^/(.*)$ https://secure.wikimedia.org/$1 [R=302] - removed any logging related lines, like ErrorLog, CustomLog and LogLevel - removed SSLEngine/SSLCertificate/Key lines of course if this is merged there also needs to be a DNS change: secure 1H IN A 208.80.152.134 ; service IP, currently on singer would become secure 1H IN CNAME wikimedia-lb Change-Id: I3f62b4edbea910f4032d324d4599637b779c8f2c --- M all.conf A secure.wikimedia.conf 2 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config refs/changes/34/60934/1 diff --git a/all.conf b/all.conf index 49bd105..889177f 100644 --- a/all.conf +++ b/all.conf @@ -36,4 +36,7 @@ # A couple of redirects for www.XXX.wikipedia.org Include /etc/apache2/wmf/postrewrites.conf +# A couple of redirects for old secure.wikimedia.org +Include /etc/apache2/wmf/secure.wikimedia.conf + # vim: syn=apache sts=4 sw=4 autoindent diff --git a/secure.wikimedia.conf b/secure.wikimedia.conf new file mode 100644 index 0000000..78ea02f --- /dev/null +++ b/secure.wikimedia.conf @@ -0,0 +1,25 @@ +# this is the old secure.wikimedia.org site +# as it was hosted on singer before we had proper https +# but cool URIs don't change, so moved over to cluster + +<VirtualHost *> + ServerName secure.wikimedia.org + ServerAdmin n...@wikimedia.org + + # Old OTRS URLs + RewriteEngine On + RewriteRule ^/otrs/(.*)$ https://ticket.wikimedia.org/otrs/$1 [R=301,L] + RewriteRule ^/otrs-web/(.*)$ https://ticket.wikimedia.org/otrs-web/$1 [R=301,L] + + # old URLs, redirect them to proper SSL + RewriteRule ^/$ https://www.wikimedia.org/ [R=301,L] + RewriteRule ^/keys\.html$ https://www.mediawiki.org/keys/keys.html [R=301,L] + RewriteRule ^/(w/.*)$ https://meta.wikimedia.org/$1 [R=301,L,NE] + RewriteRule ^/wikipedia/(advisory|auditcom|boardgovcom|board|chair|chapcom|checkuser|collab|commons|donate|exec|grants|incubator|internal|meta|movementroles|office|otrs-wiki|outreach|quality|searchcom|spcom|species|steward|strategy|usability|wikimania\d+|wikimaniateam)/(.*)$ https://$1.wikimedia.org/$2 [R=301,L,NE] + RewriteRule ^/wikipedia/foundation/(.*)$ https://wikimediafoundation.org/$1 [R=301,L,NE] + RewriteRule ^/wikipedia/mediawiki/(.*)$ https://www.mediawiki.org/$1 [R=301,L,NE] + RewriteRule ^/wikipedia/sources/(.*)$ https://wikisource.org/$1 [R=301,L,NE] + RewriteRule ^/wikipedia/wikidata/(.*)$ https://www.wikidata.org/$1 [R=301,L,NE] + RewriteRule ^/(wikipedia|wikinews|wikisource|wikibooks|wikiquote|wikiversity|wiktionary|wikimedia)/([^@:/]+)/(.*)$ https://$2.$1.org/$3 [R=301,L,NE] + +</VirtualHost> -- To view, visit https://gerrit.wikimedia.org/r/60934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f62b4edbea910f4032d324d4599637b779c8f2c Gerrit-PatchSet: 1 Gerrit-Project: operations/apache-config Gerrit-Branch: master Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
