Silke Meyer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52043
Change subject: Install Solr and Solarium on Wikidata test repos.
......................................................................
Install Solr and Solarium on Wikidata test repos.
Change-Id: I27f609fb3afcaedc88249001932dc0c1cd708119
---
A modules/wikidata_singlenode/files/solarium_composer.json
M modules/wikidata_singlenode/manifests/init.pp
M modules/wikidata_singlenode/templates/wikidata-repo-requires.php
3 files changed, 34 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/52043/1
diff --git a/modules/wikidata_singlenode/files/solarium_composer.json
b/modules/wikidata_singlenode/files/solarium_composer.json
new file mode 100644
index 0000000..b9f01ed
--- /dev/null
+++ b/modules/wikidata_singlenode/files/solarium_composer.json
@@ -0,0 +1,5 @@
+{
+ "require": {
+ "solarium/solarium": "2.4.1"
+ }
+}
diff --git a/modules/wikidata_singlenode/manifests/init.pp
b/modules/wikidata_singlenode/manifests/init.pp
index 5425cb1..894aaa3 100644
--- a/modules/wikidata_singlenode/manifests/init.pp
+++ b/modules/wikidata_singlenode/manifests/init.pp
@@ -144,7 +144,7 @@
# get the extensions
# for repo get extensions Wikibase and ULS
- mw-extension { [ "Wikibase", "UniversalLanguageSelector" ]:
+ mw-extension { [ "Wikibase", "UniversalLanguageSelector",
"WikibaseSolr" ]:
require => [Git::Clone["mediawiki"],
Exec["mediawiki_setup"], Exec["repo_move_mainpage"], Mw-extension["Diff"],
Mw-extension["DataValues"]],
}
# put a repo specific settings file to $install_path (required
by LocalSettings.php)
@@ -192,6 +192,26 @@
source =>
"puppet:///modules/wikidata_singlenode/wikidata-replication.logrotate",
owner => 'root',
}
+ # install Solr for improved search
+ class { "solr":
+ schema =>
"${install_path}/extensions/WikibaseSolr/schema.solr3.xml",
+ replication_master => "$hostname",
+ require => Mw-extension["WikibaseSolr"],
+ }
+ # manage Solarium dependency in this json file
+ file { "${install_path}/extensions/WikibaseSolr/composer.json":
+ ensure => present,
+ require => Mw-extension["WikibaseSolr"],
+ source =>
"puppet:///modules/wikidata_singlenode/solarium_composer.json",
+ }
+ # install Solarium via composer
+ exec { "get_composer":
+ require =>
File["${install_path}/extensions/WikibaseSolr/composer.json"],
+ provider => shell,
+ cwd => "${install_path}/extensions/WikibaseSolr",
+ command => "curl -sS https://getcomposer.org/installer
| php && /bin/mv composer.phar /usr/local/bin/composer &&
/usr/local/bin/composer install",
+ logoutput => "on_failure",
+ }
}
# Wikibase client only:
diff --git a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php
b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php
index cfd52e3..cbf1801 100644
--- a/modules/wikidata_singlenode/templates/wikidata-repo-requires.php
+++ b/modules/wikidata_singlenode/templates/wikidata-repo-requires.php
@@ -32,6 +32,14 @@
require_once( "$IP/extensions/OAI/OAIRepo.php" );
require_once( "$IP/extensions/notitle.php" );
+// for WikibaseSolr extension
+$wgWBSSolariumAutoloader =
"$IP/extensions/WikibaseSolr/vendor/solarium/solarium/library/Solarium/Autoloader.php";
+require_once( "$IP/extensions/WikibaseSolr/WikibaseSolr.php" );
+require_once( "$IP/extensions/WikibaseSolr/includes/SpecialSolrTest.php" );
+$wgSpecialPages['SolrTest'] = 'SpecialSolrTest';
+$wgWBStores['solrstore'] = 'SolrStore';
+$wgWBSettings['defaultStore'] = 'solrstore';
+
// items in main namespace
$baseNs = 100;
// NOTE: do *not* define WB_NS_ITEM and WB_NS_ITEM_TALK when using a core
namespace for items!
--
To view, visit https://gerrit.wikimedia.org/r/52043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27f609fb3afcaedc88249001932dc0c1cd708119
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Silke Meyer <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
