Dzahn has submitted this change and it was merged.
Change subject: Bug 39482 - Rename "chapcomwiki" to "affcomwiki"
......................................................................
Bug 39482 - Rename "chapcomwiki" to "affcomwiki"
Change-Id: I4af3104b24494b2432876e575c025ef26bcaa4b0
---
M redirects.conf
M remnant.conf
2 files changed, 12 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/redirects.conf b/redirects.conf
index a2abfc7..1880fd5 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -10,6 +10,7 @@
bugs.mediawiki.org \
bugzilla.mediawiki.org \
bugzilla.wikipedia.org \
+ chapcom.wikimedia.org \
cs.wikimedia.org \
cz.wikibooks.org \
cz.wikimedia.org \
@@ -656,6 +657,10 @@
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$
RewriteRule ^(.*)$ https://et.wikipedia.org/wiki/Portaal:Tartupeedia
[R=301,L]
diff --git a/remnant.conf b/remnant.conf
index d60f16d..5c4e548 100644
--- a/remnant.conf
+++ b/remnant.conf
@@ -722,19 +722,19 @@
</Directory>
</VirtualHost>
-# Chapcom wiki
+# affcom wiki
<VirtualHost *>
- DocumentRoot "/usr/local/apache/common/docroot/chapcom"
- ServerName chapcom.wikimedia.org
+ DocumentRoot "/usr/local/apache/common/docroot/affcom"
+ ServerName affcom.wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
- RewriteRule ^/(.*)$ https://chapcom.wikimedia.org/$1 [R=301,L]
+ RewriteRule ^/(.*)$ https://affcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
- Alias /wiki /usr/local/apache/common/docroot/chapcom/w/index.php
+ Alias /wiki /usr/local/apache/common/docroot/affcom/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/chapcom/w">
+ <Directory "/usr/local/apache/common/docroot/affcom/w">
<IfModule mod_php5.c>
php_admin_flag engine on
</IfModule>
</Directory>
- <Directory "/usr/local/apache/common/docroot/chapcom/w/extensions">
+ <Directory "/usr/local/apache/common/docroot/affcom/w/extensions">
<IfModule mod_php5.c>
php_admin_flag engine off
</IfModule>
--
To view, visit https://gerrit.wikimedia.org/r/53894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4af3104b24494b2432876e575c025ef26bcaa4b0
Gerrit-PatchSet: 4
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
