Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/54614
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 Also updated outdated puppet:// file paths. Bug: 46298 Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 --- M files/apache/sites/doc.wikimedia.org M modules/contint/files/apache/integration.mediawiki.org M modules/contint/files/apache/integration.wikimedia.org 3 files changed, 25 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/54614/1 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 n...@wikimedia.org - 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 n...@wikimedia.org + 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 n...@wikimedia.org + DocumentRoot /srv/org/wikimedia/doc ErrorLog /var/log/apache2/error.log diff --git a/modules/contint/files/apache/integration.mediawiki.org b/modules/contint/files/apache/integration.mediawiki.org index a1104de..416574d 100644 --- a/modules/contint/files/apache/integration.mediawiki.org +++ b/modules/contint/files/apache/integration.mediawiki.org @@ -1,15 +1,17 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.mediawiki.org +### puppet:///modules/contint/files/apache/integration.mediawiki.org ##################################################################### # vim: filetype=apache NameVirtualHost *:443 + <VirtualHost *:80> ServerName integration.mediawiki.org Redirect permanent / https://integration.wikimedia.org/ </VirtualHost> + <VirtualHost *:443> ServerName integration.mediawiki.org diff --git a/modules/contint/files/apache/integration.wikimedia.org b/modules/contint/files/apache/integration.wikimedia.org index d6547e3..5cf9ed3 100644 --- a/modules/contint/files/apache/integration.wikimedia.org +++ b/modules/contint/files/apache/integration.wikimedia.org @@ -1,10 +1,11 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.wikimedia.org +### puppet:///modules/contint/files/apache/integration.wikimedia.org ##################################################################### # vim: filetype=apache NameVirtualHost *:443 + <VirtualHost *:80> ServerName integration.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/54614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <ttij...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
