Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/129171
Change subject: Piggyback cirrus' configuration off jenkins config ...................................................................... Piggyback cirrus' configuration off jenkins config Cirrus has configures jenkins in php in Cirrus' code base. We may as well just use it in vagrant rather than debulicate it. Change-Id: Ib0ed378be272940d49e47a335e57123a1ecc6a78 --- M puppet/modules/elasticsearch/templates/CirrusSearch.php.erb 1 file changed, 2 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/71/129171/1 diff --git a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb index 21261f7..7f48a9d 100644 --- a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb +++ b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb @@ -1,25 +1,2 @@ -$wgSearchType = 'CirrusSearch'; -$wgGroupPermissions[ '*' ][ 'deleterevision' ] = true; -$wgUseInstantCommons = true; -$wgCapitalLinks = false; -$wgEnableUploads = true; -$wgCirrusSearchShowScore = true; -$wgShowExceptionDetails = true; -$wgJobTypeConf['default'] = array( - 'class' => 'JobQueueRedis', - 'order' => 'fifo', - 'redisServer' => 'localhost', - 'checkDelay' => true, - 'maximumPeriodicTaskSeconds' => 1, - 'redisConfig' => array( - 'password' => '', - ), -); -$wgJobQueueAggregator = array( - 'class' => 'JobQueueAggregatorRedis', - 'redisServer' => 'localhost', - 'redisConfig' => array( - 'password' => '', - ), -); -$wgJobRunRate = 10; +$wgRedisPassword = ''; +include_once "$IP/extensions/CirrusSearch/tests/jenkins/Jenkins.php"; -- To view, visit https://gerrit.wikimedia.org/r/129171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0ed378be272940d49e47a335e57123a1ecc6a78 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Manybubbles <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
