jenkins-bot has submitted this change and it was merged. Change subject: Add $wgGraphAllowedDomains setting for future ......................................................................
Add $wgGraphAllowedDomains setting for future Graph will use new settings style instead of current one, this is a noop for now. https://www.mediawiki.org/wiki/Extension:Graph#External_data Corresponding puppet patch I5b737345af00818f5eb048222889a938b7fd440e Change-Id: Ifd765e960264359c9630c1c65825d314446fb31c --- M wmf-config/CommonSettings-labs.php M wmf-config/CommonSettings.php 2 files changed, 37 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index 79fa503..331079d 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -352,6 +352,15 @@ $wgEchoSharedTrackingCluster = false; } +if ( $wmgUseGraph ) { + // **** THIS LIST MUST MATCH puppet/hieradata/labs/deployment-prep/common.yaml **** + // See https://www.mediawiki.org/wiki/Extension:Graph#External_data + $wgGraphAllowedDomains['http'] = array( 'wmflabs.org' ); + $wgGraphAllowedDomains['wikirawupload'][] = 'upload.beta.wmflabs.org'; + $wgGraphAllowedDomains['wikidatasparql'][] = 'wdqs-test.wmflabs.org'; +} + + // Experimental $wgGadgetsCaching = false; diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 918519d..5ea70ea 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2926,6 +2926,34 @@ // Soon $wgGraphDataDomains will be removed $wgGraphDataDomains = $wgGraphHttpsDomains; + // This setting will replace both of the above + // + // **** THIS LIST MUST MATCH puppet/hieradata/role/common/scb.yaml **** + // See https://www.mediawiki.org/wiki/Extension:Graph#External_data + // + $wgGraphAllowedDomains = array( + 'https' => array( + 'mediawiki.org', + 'wikibooks.org', + 'wikidata.org', + 'wikimedia.org', + 'wikimediafoundation.org', + 'wikinews.org', + 'wikipedia.org', + 'wikiquote.org', + 'wikisource.org', + 'wikiversity.org', + 'wikivoyage.org', + 'wiktionary.org', + ), + 'wikirawupload' => array( + 'upload.wikimedia.org', + ), + 'wikidatasparql' => array( + 'query.wikidata.org', + ), + ); + if ( $wmgUseGraphWithNamespace ) { $wgJsonConfigModels['Graph.JsonConfig'] = 'Graph\Content'; $wgJsonConfigs['Graph.JsonConfig'] = array( -- To view, visit https://gerrit.wikimedia.org/r/269896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd765e960264359c9630c1c65825d314446fb31c Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Yurik <[email protected]> Gerrit-Reviewer: Florianschmidtwelzow <[email protected]> Gerrit-Reviewer: Thcipriani <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
