jenkins-bot has submitted this change and it was merged. Change subject: Remove upload7 references ......................................................................
Remove upload7 references Bug: T129586 Change-Id: I322fdd500341cc6c8c2d0688860b1b7a72956e8d --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 2 insertions(+), 13 deletions(-) Approvals: Alex Monk: Looks good to me, but someone else must approve Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 0859acd..482147b 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -284,8 +284,6 @@ return true; }; -$wgFileStore['deleted']['directory'] = "/mnt/upload7/private/archive/$site/$lang"; - # used for mysql/search settings $tmarray = getdate( time() ); $hour = $tmarray['hours']; @@ -1274,7 +1272,6 @@ $wgGroupPermissions['autoconfirmed']['skipcaptcha'] = true; $wgCaptchaFileBackend = 'global-multiwrite'; $wgCaptchaSecret = $wmgCaptchaSecret; - $wgCaptchaDirectory = '/mnt/upload7/private/captcha'; $wgCaptchaDirectoryLevels = 3; $wgCaptchaStorageClass = 'CaptchaCacheStore'; $wgCaptchaClass = 'FancyCaptcha'; diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 69f64af..0ed1e42 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2000,15 +2000,7 @@ ], 'wgUploadDirectory' => [ - # Using upload7 since Oct 2012 - 'default' => '/mnt/upload7/$site/$lang', - 'private' => '/mnt/upload7/private/$lang', - - 'wikimania2005wiki' => '/mnt/upload7/wikipedia/wikimania', // back compat - 'otrs_wikiwiki' => '/mnt/upload7/private/otrs_wiki', - 'execwiki' => '/mnt/upload7/private/execwiki', - 'transitionteamwiki' => '/mnt/upload7/private/transitionteamwiki', - 'iegcomwiki' => '/mnt/upload7/private/iegcomwiki', + 'default' => false, 'wikitech' => '/srv/org/wikimedia/controller/wikis/images', ], @@ -14212,7 +14204,7 @@ ], 'wgMathDirectory' => [ - 'default' => '/mnt/upload7/math', + 'default' => false, 'wikitech' => '/srv/math-images', // T126628 ], -- To view, visit https://gerrit.wikimedia.org/r/280170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I322fdd500341cc6c8c2d0688860b1b7a72956e8d Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Alex Monk <a...@wikimedia.org> Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits