Andrew Bogott has submitted this change and it was merged.
Change subject: Add WikibaseDataModel dependency for wikidata singlenode
......................................................................
Add WikibaseDataModel dependency for wikidata singlenode
Change-Id: Iafbe80f948bcf17f9f2f305396e3d6289665e22a
---
M modules/wikidata_singlenode/manifests/init.pp
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wikidata_singlenode/manifests/init.pp
b/modules/wikidata_singlenode/manifests/init.pp
index 3937273..fbbcd7f 100644
--- a/modules/wikidata_singlenode/manifests/init.pp
+++ b/modules/wikidata_singlenode/manifests/init.pp
@@ -15,7 +15,7 @@
$ensure = latest,
$install_repo = true,
$install_client = true,
- $role_requires =
['"$IP/extensions/Diff/Diff.php"',
'"$IP/extensions/DataValues/DataValues.php"',
'"$IP/extensions/Wikibase/lib/WikibaseLib.php"'],
+ $role_requires =
['"$IP/extensions/Diff/Diff.php"',
'"$IP/extensions/DataValues/DataValues.php"',
'"$IP/extensions/WikibaseDataModel/WikibaseDataModel.php"',
'"$IP/extensions/Wikibase/lib/WikibaseLib.php"'],
$role_config_lines = [
'$wgShowExceptionDetails = true' ]) {
class { mediawiki_singlenode:
@@ -60,7 +60,7 @@
}
# get the dependencies for Wikibase extension after the successful
installation of mediawiki core
- mediawiki_singlenode::mw-extension { [ "Diff", "DataValues" ]:
+ mediawiki_singlenode::mw-extension { [ "Diff", "DataValues",
"WikibaseDataModel" ]:
require => [Git::Clone["mediawiki"], Exec["mediawiki_setup"]],
install_path => $install_path,
}
@@ -132,7 +132,7 @@
# get the extensions
# for repo get extensions Wikibase and ULS
mediawiki_singlenode::mw-extension { [ "Wikibase",
"UniversalLanguageSelector", "Babel", "Translate", "AbuseFilter" ]:
- require => [Git::Clone["mediawiki"],
Exec["mediawiki_setup"],
Exec["repo_move_mainpage"],Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["DataValues"]],
+ require => [Git::Clone["mediawiki"],
Exec["mediawiki_setup"],
Exec["repo_move_mainpage"],Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["DataValues"],
Mediawiki_singlenode::Mw-extension["WikibaseDataModel"]],
install_path => $install_path,
}
# put a repo specific settings file to $install_path (required
by LocalSettings.php)
@@ -187,7 +187,7 @@
# get the extensions
# for client get extensions Wikibase and ParserFunctions
(needed) and a bunch of other extensions that are on Wikipedias
mediawiki_singlenode::mw-extension { [ "Wikibase",
"ParserFunctions", "AbuseFilter", "AntiBot", "AntiSpoof", "APC",
"ArticleFeedback", "ArticleFeedbackv5", "AssertEdit", "Babel", "CategoryTree",
"CharInsert", "CheckUser", "Cite", "cldr", "ClickTracking", "CodeEditor",
"Collection", "CustomData", "Echo", "EditPageTracking", "EmailCapture",
"ExpandTemplates", "FeaturedFeeds", "FlaggedRevs", "Gadgets", "GlobalUsage",
"ImageMap", "InputBox", "Interwiki", "LocalisationUpdate", "MarkAsHelpful",
"Math", "MobileFrontend", "MwEmbedSupport", "MWSearch", "NewUserMessage",
"normal", "OATHAuth", "OpenSearchXml", "Oversight", "PagedTiffHandler",
"PageTriage", "PdfHandler", "Poem", "PoolCounter", "PostEdit",
"ReaderFeedback", "RelatedArticles", "RelatedSites", "Renameuser", "Scribunto",
"SecurePoll", "SimpleAntiSpam", "SwiftCloudFiles", "SyntaxHighlight_GeSHi",
"TemplateSandbox", "TitleKey", "TorBlock", "Translate", "UserDailyContribs",
"UserMerge", "Vector", "WikiEditor", "wikihiero", "WikiLove",
"WikimediaMaintenance", "WikimediaMessages" ]:
- require => [Git::Clone["mediawiki"],
Exec["mediawiki_setup"], Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["DataValues"]],
+ require => [Git::Clone["mediawiki"],
Exec["mediawiki_setup"], Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["WikibaseDataModel"],
Mediawiki_singlenode::Mw-extension["DataValues"]],
install_path => $install_path,
}
# put a client specific settings file to $install_path
(required by LocalSettings.php)
@@ -258,8 +258,8 @@
if $ensure == 'latest' {
exec { 'wikidata_update':
require => $install_repo ? {
- true => [Git::Clone["mediawiki"],
Mediawiki_singlenode::Mw-extension["UniversalLanguageSelector"],
Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["DataValues"],
Mediawiki_singlenode::Mw-extension["Wikibase"],
File["${install_path}/LocalSettings.php"]],
- default => [Git::Clone["mediawiki"],
Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["DataValues"],
Mediawiki_singlenode::Mw-extension["Wikibase"],
File["${install_path}/LocalSettings.php"]],
+ true => [Git::Clone["mediawiki"],
Mediawiki_singlenode::Mw-extension["UniversalLanguageSelector"],
Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["DataValues"],
Mediawiki_singlenode::Mw-extension["WikibaseDataModel"],
Mediawiki_singlenode::Mw-extension["Wikibase"],
File["${install_path}/LocalSettings.php"]],
+ default => [Git::Clone["mediawiki"],
Mediawiki_singlenode::Mw-extension["Diff"],
Mediawiki_singlenode::Mw-extension["DataValues"],
Mediawiki_singlenode::Mw-extension["WikibaseDataModel"],
Mediawiki_singlenode::Mw-extension["Wikibase"],
File["${install_path}/LocalSettings.php"]],
},
command => "/usr/bin/php
${install_path}/maintenance/update.php --quick --conf
'${install_path}/LocalSettings.php'",
logoutput => "on_failure",
--
To view, visit https://gerrit.wikimedia.org/r/73940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafbe80f948bcf17f9f2f305396e3d6289665e22a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
