Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/197381
Change subject: Don't use bits for test.wikidata ...................................................................... Don't use bits for test.wikidata To avoid issues with JS or other resources when stuff is being tested on mw1017. Bug: T92949 Change-Id: I55977ece6f557111402751ff00f784182977e404 --- M wmf-config/CommonSettings.php 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/197381/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index fbbcb9d..7fe5434 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -94,6 +94,7 @@ $wmfHostnames['bits'] = 'bits.wikimedia.org'; $wmfHostnames['meta'] = 'meta.wikimedia.org'; $wmfHostnames['test'] = 'test.wikipedia.org'; + $wmfHostnames['testwikidata'] = 'test.wikidata.org'; $wmfHostnames['upload'] = 'upload.wikimedia.org'; $wmfHostnames['wikidata'] = 'www.wikidata.org'; break; @@ -229,6 +230,10 @@ $wgExtensionAssetsPath = "//{$wmfHostnames['test']}/w/static-$wmfVersionNumber/extensions"; $wgStyleSheetPath = "//{$wmfHostnames['test']}/w/static-$wmfVersionNumber/skins"; $wgResourceBasePath = "//{$wmfHostnames['test']}/w/static-$wmfVersionNumber"; // This means resources will be requested from /w/static-VERSION/resources +} elseif ( $wgDBname == 'testwikidatawiki' && $wmfRealm === 'production' ) { + $wgExtensionAssetsPath = "//{$wmfHostnames['testwikidata']}/w/static-$wmfVersionNumber/extensions"; + $wgStyleSheetPath = "//{$wmfHostnames['testwikidata']}/w/static-$wmfVersionNumber/skins"; + $wgResourceBasePath = "//{$wmfHostnames['testwikidata']}/w/static-$wmfVersionNumber"; // This means resources will be requested from /w/static-VERSION/resources } elseif ( $wgDBname == 'labswiki' ) { $wgExtensionAssetsPath = "//wikitech.wikimedia.org/w/static-$wmfVersionNumber/extensions"; $wgStyleSheetPath = "//wikitech.wikimedia.org/w/static-$wmfVersionNumber/skins"; @@ -250,7 +255,7 @@ if ( gethostname() === 'osmium' ) { $wgResourceLoaderStorageEnabled = false; -} else if ( !in_array( $wgDBname, array( 'testwiki', 'labswiki' ) ) && isset( $_SERVER['SERVER_NAME'] ) ) { +} else if ( !in_array( $wgDBname, array( 'testwiki', 'testwikidatawiki', 'labswiki' ) ) && isset( $_SERVER['SERVER_NAME'] ) ) { // Make testing JS/skin changes easy by not running load.php through bits for testwiki $wgLoadScript = "//{$wmfHostnames['bits']}/{$_SERVER['SERVER_NAME']}/load.php"; } -- To view, visit https://gerrit.wikimedia.org/r/197381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55977ece6f557111402751ff00f784182977e404 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude <aude.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits