Andrew Bogott has submitted this change and it was merged.
Change subject: Fix up the mediawiki extension class a bit.
......................................................................
Fix up the mediawiki extension class a bit.
Change-Id: Ia674ceaa6d670b2c9f3240575b361aab41eec63a
---
M modules/mediawiki_singlenode/manifests/init.pp
M modules/mediawiki_singlenode/manifests/mw-extension.pp
M modules/wikidata_singlenode/manifests/init.pp
3 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Checked; Looks good to me, approved
Silke Meyer: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/mediawiki_singlenode/manifests/init.pp
b/modules/mediawiki_singlenode/manifests/init.pp
index 69b2205..7c72d3b 100644
--- a/modules/mediawiki_singlenode/manifests/init.pp
+++ b/modules/mediawiki_singlenode/manifests/init.pp
@@ -42,6 +42,8 @@
# get the extensions
mw-extension { [ "Nuke", "SpamBlacklist", "ConfirmEdit" ]:
require => Git::Clone["mediawiki"],
+ ensure => $ensure,
+ install_path => $install_path;
}
file {
diff --git a/modules/mediawiki_singlenode/manifests/mw-extension.pp
b/modules/mediawiki_singlenode/manifests/mw-extension.pp
index 11fdadb..7769d6b 100644
--- a/modules/mediawiki_singlenode/manifests/mw-extension.pp
+++ b/modules/mediawiki_singlenode/manifests/mw-extension.pp
@@ -2,12 +2,8 @@
define mw-extension(
# defaults
$branch="master",
- $ssh="",
- $owner="root",
- $group="root",
- $timeout="300",
- $depth="full",
- $mode=0755) {
+ $ensure=present,
+ $install_path="/srv/mediawiki") {
git::clone { "$name":
require => git::clone["mediawiki"],
directory => "${install_path}/extensions/${name}",
diff --git a/modules/wikidata_singlenode/manifests/init.pp
b/modules/wikidata_singlenode/manifests/init.pp
index 33d2498..384be5c 100644
--- a/modules/wikidata_singlenode/manifests/init.pp
+++ b/modules/wikidata_singlenode/manifests/init.pp
@@ -72,11 +72,13 @@
# get the dependencies for Wikibase extension after the successful
installation of mediawiki core
mw-extension { [ "Diff", "DataValues" ]:
require => [Git::Clone["mediawiki"], Exec["mediawiki_setup"]],
+ install_path => $install_path,
}
# get more extensions for Wikidata test instances
mw-extension { [ "DismissableSiteNotice", "ApiSandbox", "OAI",
"SiteMatrix" ]:
require => Git::Clone["mediawiki"],
+ install_path => $install_path,
}
# get "mediawiki-config" for SiteMatrix extension
git::clone { "mwconfig":
@@ -146,6 +148,7 @@
# for repo get extensions Wikibase and ULS
mw-extension { [ "Wikibase", "UniversalLanguageSelector",
"Babel", "Translate", "AbuseFilter" ]:
require => [Git::Clone["mediawiki"],
Exec["mediawiki_setup"], Exec["repo_move_mainpage"], Mw-extension["Diff"],
Mw-extension["DataValues"]],
+ install_path => $install_path,
}
# put a repo specific settings file to $install_path (required
by LocalSettings.php)
file { "${install_path}/wikidata_repo_requires.php":
@@ -200,6 +203,7 @@
# for client get extensions Wikibase and ParserFunctions
(needed) and a bunch of other extensions that are on Wikipedias
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"], Mw-extension["Diff"], Mw-extension["DataValues"]],
+ install_path => $install_path,
}
# put a client specific settings file to $install_path
(required by LocalSettings.php)
file { "${install_path}/wikidata_client_requires.php":
--
To view, visit https://gerrit.wikimedia.org/r/51797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia674ceaa6d670b2c9f3240575b361aab41eec63a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Silke Meyer <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
