mediawiki: merge changes in from staging
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
parent
cd4835f27f
commit
08e7c38a96
1 changed files with 0 additions and 16 deletions
|
@ -14,17 +14,9 @@
|
||||||
#ini_set( 'display_errors', 1 );
|
#ini_set( 'display_errors', 1 );
|
||||||
|
|
||||||
# Added for timeout testing
|
# Added for timeout testing
|
||||||
{% if env == "staging" %}
|
|
||||||
#require_once( "includes/DefaultSettings.php" );
|
#require_once( "includes/DefaultSettings.php" );
|
||||||
{% else %}
|
|
||||||
require_once( "includes/DefaultSettings.php" );
|
|
||||||
{% endif %}
|
|
||||||
#$wgDebugLogFile = '/tmp/out.log';
|
#$wgDebugLogFile = '/tmp/out.log';
|
||||||
{% if env == "staging" %}
|
|
||||||
#$wgCaptchaClass = 'SimpleCaptcha';
|
#$wgCaptchaClass = 'SimpleCaptcha';
|
||||||
{% else %}
|
|
||||||
$wgCaptchaClass = 'SimpleCaptcha';
|
|
||||||
{% endif %}
|
|
||||||
#$wgCaptchaClass = 'FancyCaptcha';
|
#$wgCaptchaClass = 'FancyCaptcha';
|
||||||
#$wgCaptchaDirectory = "/mnt/web/attachments/captchas";
|
#$wgCaptchaDirectory = "/mnt/web/attachments/captchas";
|
||||||
#$wgCaptchaDirectoryLevels = 0;
|
#$wgCaptchaDirectoryLevels = 0;
|
||||||
|
@ -652,14 +644,6 @@ $_SERVER['HTTP_HOST'] = 'fedoraproject.org';
|
||||||
$_SERVER['REQUEST_SCHEME'] = 'https';
|
$_SERVER['REQUEST_SCHEME'] = 'https';
|
||||||
$_SERVER['SERVER_PORT'] = 443;
|
$_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
|
# Looks like mediawiki is using undefined constants.... Let's shut that up
|
||||||
error_reporting(E_ALL ^ E_NOTICE);
|
error_reporting(E_ALL ^ E_NOTICE);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue