Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67341
Change subject: Fixup docroot code to work for wikimanias all from one docroot
folder
......................................................................
Fixup docroot code to work for wikimanias all from one docroot folder
Fixup and update some comments
Change-Id: I2a40b0e1413b97241ed15bc3add7395de1f7e545
---
M multiversion/MWMultiVersion.php
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/41/67341/1
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 92a4c05..81b341b 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -129,14 +129,15 @@
$site = "wikipedia";
if ( getenv( 'MW_LANG' ) ) {
- # Language forced from some hacky script like
extract2.php
+ // Language forced from some hacky script like
extract2.php
$lang = getenv( 'MW_LANG' );
} elseif ( preg_match(
'/^\/usr\/local\/apache\/(?:htdocs|common\/docroot)\/([a-z]+)\.org/', $docRoot,
$matches ) ) {
- # This is the poor man / hacky routing engine for WMF
cluster
+ // This is the poor man / hacky routing engine for WMF
cluster
+ // Caters for multi subdomain projects (ie
*.wikipedia.org)
$site = $matches[1];
if ( preg_match( '/^(.*)\.' . preg_quote( $site ) .
'\.org$/', $serverName, $matches ) ) {
$lang = $matches[1];
- // For some special subdomains, like pa.us
+ // For some special subdomains, like arbcom.en
(et al)
$lang = str_replace( '.', '-', $lang );
} elseif ( preg_match(
'/^([^.]+)\.[^.]+\.beta\.wmflabs\.org$/', $serverName, $matches ) ) {
// http://en.wikipedia.beta.wmflabs.org/
@@ -145,8 +146,14 @@
self::error( "Invalid host name ($serverName),
can't determine language.\n" );
}
} elseif ( preg_match(
"/^\/usr\/local\/apache\/(?:htdocs|common\/docroot)\/([a-z0-9\-_]*)$/",
$docRoot, $matches ) ) {
- $site = "wikipedia";
+ // Miscellaneous one off docroots
$lang = $matches[1];
+
+ // Remove need for duplicate docroots for wikimania
wikis
+ if ( $lang === 'wikimania' ) {
+ preg_match(
'/^(wikimania\d{4})\.wikimedia\.org$/', $serverName, $matches )
+ $lang = $matches[1];;
+ }
} else {
self::error( "Invalid host name (docroot=" . $docRoot .
"), can't determine language.\n" );
}
--
To view, visit https://gerrit.wikimedia.org/r/67341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a40b0e1413b97241ed15bc3add7395de1f7e545
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
