From 08e7c38a96eed1cdc6407cfce2e1101ccbab021f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 31 May 2023 16:57:58 -0700
Subject: [PATCH] mediawiki: merge changes in from staging

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 .../mediawiki/templates/LocalSettings.php.fp.j2  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index b43e51a493..5245e26c53 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -14,17 +14,9 @@
 #ini_set( 'display_errors', 1 );
 
 # Added for timeout testing
-{% if env == "staging" %}
 #require_once( "includes/DefaultSettings.php" );
-{% else %}
-require_once( "includes/DefaultSettings.php" );
-{% endif %}
 #$wgDebugLogFile         = '/tmp/out.log';
-{% if env == "staging" %}
 #$wgCaptchaClass = 'SimpleCaptcha';
-{% else %}
-$wgCaptchaClass = 'SimpleCaptcha';
-{% endif %}
 #$wgCaptchaClass = 'FancyCaptcha';
 #$wgCaptchaDirectory = "/mnt/web/attachments/captchas";
 #$wgCaptchaDirectoryLevels = 0;
@@ -652,14 +644,6 @@ $_SERVER['HTTP_HOST'] = 'fedoraproject.org';
 $_SERVER['REQUEST_SCHEME'] = 'https';
 $_SERVER['SERVER_PORT'] = 443;
 
-# do not bother to throttle login attempts
-# users MUST have a valid OIDC token so brute force will get them nowhere.
-{% if env == "staging" %}
-#$wgPasswordAttemptThrottle = false;
-{% else %}
-$wgPasswordAttemptThrottle = false;
-{% endif %}
-
 # Looks like mediawiki is using undefined constants.... Let's shut that up
 error_reporting(E_ALL ^ E_NOTICE);