Set wgCdnServers for miraheze.org (#5772)

We are using varnish behind Cloudflare without using cf for caching now.
miraheze · Dec 20, 2024 · cddfe0d · cddfe0d
1 parent faf9d1c
commit cddfe0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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)