jenkins-bot has submitted this change and it was merged.
Change subject: Removed fileJournal config; this has been unused for some time
......................................................................
Removed fileJournal config; this has been unused for some time
Change-Id: I3c4bc698e5132fec4ec0b8ea36ecd68e51cd51e5
---
M wmf-config/filebackend.php
1 file changed, 0 insertions(+), 8 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index 16c4177..f96eccf 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -6,8 +6,6 @@
# This file hold the configuration for the file backends
# for production.
-$wmfFileJournalTTL = 365; // days
-
/* Common OpenStack Swift backend config */
$wmfSwiftBigWikis = array( # DO NOT change without proper migration first
'commonswiki', 'dewiki', 'enwiki', 'fiwiki', 'frwiki', 'hewiki',
'huwiki', 'idwiki',
@@ -23,7 +21,6 @@
'name' => 'local-swift-eqiad',
'wikiId' => "{$site}-{$lang}",
'lockManager' => 'nullLockManager', // LocalFile uses FOR UPDATE
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfSwiftEqiadConfig['authUrl'],
'swiftUser' => $wmfSwiftEqiadConfig['user'],
'swiftKey' => $wmfSwiftEqiadConfig['key'],
@@ -43,7 +40,6 @@
'name' => 'shared-swift-eqiad',
'wikiId' => "wikipedia-commons",
'lockManager' => 'nullLockManager', // just thumbnails
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfSwiftEqiadConfig['authUrl'],
'swiftUser' => $wmfSwiftEqiadConfig['user'],
'swiftKey' => $wmfSwiftEqiadConfig['key'],
@@ -80,7 +76,6 @@
'name' => 'local-swift',
'wikiId' => "{$site}-{$lang}",
'lockManager' => 'nullLockManager', // LocalFile uses FOR UPDATE
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfSwiftConfig['authUrl'],
'swiftUser' => $wmfSwiftConfig['user'],
'swiftKey' => $wmfSwiftConfig['key'],
@@ -100,7 +95,6 @@
'name' => 'shared-swift',
'wikiId' => "wikipedia-commons",
'lockManager' => 'nullLockManager', // just thumbnails
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfSwiftConfig['authUrl'],
'swiftUser' => $wmfSwiftConfig['user'],
'swiftKey' => $wmfSwiftConfig['key'],
@@ -137,7 +131,6 @@
'name' => 'local-multiwrite',
'wikiId' => "{$site}-{$lang}",
'lockManager' => 'nullLockManager', # LocalFile uses FOR UPDATE
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => $wmfFileJournalTTL ),
'backends' => array(
# DO NOT change the master backend unless it is fully trusted
or autoRsync is off
array( 'template' => 'local-swift', 'isMultiMaster' => false ),
@@ -151,7 +144,6 @@
'name' => 'shared-multiwrite',
'wikiId' => "wikipedia-commons",
'lockManager' => 'nullLockManager', // just thumbnails
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => $wmfFileJournalTTL ),
'backends' => array(
# DO NOT change the master backend unless it is fully trusted
or autoRsync is off
array( 'template' => 'shared-swift', 'isMultiMaster' => false ),
--
To view, visit https://gerrit.wikimedia.org/r/104316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c4bc698e5132fec4ec0b8ea36ecd68e51cd51e5
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
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
