Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192843
Change subject: Support composer managed skin dependencies
......................................................................
Support composer managed skin dependencies
Change-Id: I1ab8f6c3672c6370369a9959cc604b3586754067
---
M puppet/modules/mediawiki/manifests/skin.pp
1 file changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/43/192843/1
diff --git a/puppet/modules/mediawiki/manifests/skin.pp
b/puppet/modules/mediawiki/manifests/skin.pp
index 60bcecd..4e87435 100644
--- a/puppet/modules/mediawiki/manifests/skin.pp
+++ b/puppet/modules/mediawiki/manifests/skin.pp
@@ -36,6 +36,10 @@
# Settings may be specified as a hash, array, or string. See examples
# below. Empty by default.
#
+# [*composer*]
+# Whether this skin has dependencies that need to be installed via Composer.
+# Default: false.
+#
# === Examples
#
# The following example configures the Vector skin and
@@ -54,13 +58,15 @@
$default = false,
$branch = undef,
$settings = {},
+ $composer = false,
) {
include ::mediawiki
$skin_dir = "${mediawiki::dir}/skins/${skin}"
+ $skin_repo = "mediawiki/skins/${skin}"
- if ! defined(Git::Clone["mediawiki/skins/${skin}"]) {
- git::clone { "mediawiki/skins/${skin}":
+ if ! defined(Git::Clone[$skin_repo]) {
+ git::clone { $skin_repo:
directory => $skin_dir,
branch => $branch,
require => Git::Clone['mediawiki/core'],
@@ -72,6 +78,14 @@
wiki => $wiki,
header => template('mediawiki/skin.php.erb'),
values => $settings,
- require => Git::Clone["mediawiki/skins/${skin}"],
+ require => Git::Clone[$skin_repo],
+ }
+
+ if $composer {
+ php::composer::install{ $skin_dir:
+ require => Git::Clone[$skin_repo],
+ }
+
+ Php::Composer::Install[$skin_dir] ~> Mediawiki::Settings[$title]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/192843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ab8f6c3672c6370369a9959cc604b3586754067
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
