Asher has submitted this change and it was merged. Change subject: Revert "Bug 39482 - Rename "chapcomwiki" to "affcomwiki"" ......................................................................
Revert "Bug 39482 - Rename "chapcomwiki" to "affcomwiki"" This reverts commit 3aca8a7bc26b45caa4c9348b77386d5de852d608 Change-Id: Ifaf1c99f15772933a62faca6959cbbced38fec1b --- M redirects.conf M remnant.conf 2 files changed, 7 insertions(+), 12 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/redirects.conf b/redirects.conf index 1880fd5..a2abfc7 100644 --- a/redirects.conf +++ b/redirects.conf @@ -10,7 +10,6 @@ bugs.mediawiki.org \ bugzilla.mediawiki.org \ bugzilla.wikipedia.org \ - chapcom.wikimedia.org \ cs.wikimedia.org \ cz.wikibooks.org \ cz.wikimedia.org \ @@ -656,10 +655,6 @@ # sometime in 2013 RewriteCond %{HTTP_HOST} =wlm.wikimedia.org RewriteRule ^(.*)$ http://toolserver.org/~erfgoed$1 [R=301,L,NE] - - # chapcom -> affcom - RewriteCond %{HTTP_HOST} =chapcom.wikimedia.org - RewriteRule ^(.*)$ https://affcom.wikimedia.org$1 [R=301,L,NE] # tartupeedia.ee (WMEE-owned domain) - bug 44893 RewriteCond %{HTTP_HOST} (.*)tartupeedia\.ee$ diff --git a/remnant.conf b/remnant.conf index 5c4e548..d60f16d 100644 --- a/remnant.conf +++ b/remnant.conf @@ -722,19 +722,19 @@ </Directory> </VirtualHost> -# affcom wiki +# Chapcom wiki <VirtualHost *> - DocumentRoot "/usr/local/apache/common/docroot/affcom" - ServerName affcom.wikimedia.org + DocumentRoot "/usr/local/apache/common/docroot/chapcom" + ServerName chapcom.wikimedia.org AllowEncodedSlashes On RewriteEngine On RewriteCond %{HTTP:X-Forwarded-Proto} !https - RewriteRule ^/(.*)$ https://affcom.wikimedia.org/$1 [R=301,L] + RewriteRule ^/(.*)$ https://chapcom.wikimedia.org/$1 [R=301,L] # Primary wiki redirector: - Alias /wiki /usr/local/apache/common/docroot/affcom/w/index.php + Alias /wiki /usr/local/apache/common/docroot/chapcom/w/index.php RewriteRule ^/$ /w/index.php # UseMod compatibility URLs @@ -747,12 +747,12 @@ # Configurable favicon RewriteRule ^/favicon\.ico$ /w/favicon.php [L] - <Directory "/usr/local/apache/common/docroot/affcom/w"> + <Directory "/usr/local/apache/common/docroot/chapcom/w"> <IfModule mod_php5.c> php_admin_flag engine on </IfModule> </Directory> - <Directory "/usr/local/apache/common/docroot/affcom/w/extensions"> + <Directory "/usr/local/apache/common/docroot/chapcom/w/extensions"> <IfModule mod_php5.c> php_admin_flag engine off </IfModule> -- To view, visit https://gerrit.wikimedia.org/r/53914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifaf1c99f15772933a62faca6959cbbced38fec1b Gerrit-PatchSet: 1 Gerrit-Project: operations/apache-config Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Asher <afeld...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits