diff --git a/GlobalCache.php b/GlobalCache.php index 9761e181ac..a64dc1b72e 100644 --- a/GlobalCache.php +++ b/GlobalCache.php @@ -5,8 +5,7 @@ $beta = preg_match( '/^(.*)\.(mirabeta|nexttide)\.org$/', $wi->server ); -// Retain $wgCdnServers for wikis not using cloudflare (wikitide.org domain or custom domains) -if ( !$beta && !preg_match( '/^(.*)\.miraheze\.org$/', $wi->server ) ) { +if ( !$beta ) { $wgCdnServers = [ /** cp36 */ '[2602:294:0:b13::110]:81', diff --git a/LocalSettings.php b/LocalSettings.php index 2c2fb67228..b1e3ddb610 100644 --- a/LocalSettings.php +++ b/LocalSettings.php @@ -4348,18 +4348,12 @@ 'default' => false, ], - // MultiPurge + // MultiPurge (TODO: Remove extension) 'wgMultiPurgeEnabledServices' => [ - 'default' => [ - 'Cloudflare', - // 'Varnish', - ], + 'default' => null ], 'wgMultiPurgeServiceOrder' => [ - 'default' => [ - // 'Varnish', - 'Cloudflare', - ], + 'default' => null ], // MultimediaViewer (not beta)