Faidon has submitted this change and it was merged. Change subject: doc.mediawiki.org: Redirect to canonical wikimedia.org and fix invalid SSL ......................................................................
doc.mediawiki.org: Redirect to canonical wikimedia.org and fix invalid SSL I don't know since when but apparently doc.mediawiki.org has been registered in addition to doc.wikimedia.org and pointed to the same server, but Apache was never properly configured for it so we were serving duplicate content on these 4 different urls, of which one was causing an invalid certificate error. (http/https)://doc.(mediawiki,wikimedia).org -> https://doc.wikimedia.org Bug: 46298 Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 --- M files/apache/sites/doc.wikimedia.org 1 file changed, 20 insertions(+), 8 deletions(-) Approvals: Hashar: Looks good to me, but someone else must approve Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/files/apache/sites/doc.wikimedia.org b/files/apache/sites/doc.wikimedia.org index 60a577f..a9cacba 100644 --- a/files/apache/sites/doc.wikimedia.org +++ b/files/apache/sites/doc.wikimedia.org @@ -5,20 +5,32 @@ # vim: filetype=apache <VirtualHost *:80> - ServerAdmin [email protected] - ServerName doc.wikimedia.org + ServerName doc.mediawiki.org - DocumentRoot /srv/org/wikimedia/doc - - ErrorLog /var/log/apache2/error.log - LogLevel warn - CustomLog /var/log/apache2/access.log combined + Redirect permanent / https://doc.wikimedia.org/ </VirtualHost> <VirtualHost *:443> - ServerAdmin [email protected] + ServerName doc.mediawiki.org + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/star.mediawiki.org.pem + SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key + SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem + + Redirect permanent / https://doc.wikimedia.org/ +</VirtualHost> + +<VirtualHost *:80> ServerName doc.wikimedia.org + Redirect permanent / https://doc.wikimedia.org/ +</VirtualHost> + +<VirtualHost *:443> + ServerName doc.wikimedia.org + ServerAdmin [email protected] + DocumentRoot /srv/org/wikimedia/doc ErrorLog /var/log/apache2/error.log -- To view, visit https://gerrit.wikimedia.org/r/54614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Demon <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Faidon <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
