BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387157 )
Change subject: Make AntiSpoof with external dependencies work
......................................................................
Make AntiSpoof with external dependencies work
Add the composer.json of all provisioned extensions to the
composer-merge-plugin include path. This will make the existing
Puppet rules process the extension composer settings when
maintaining the top level mediawiki/vendor directory.
I'm not completely sure this is the right way to fix the current master
of AntiSpoof. I believe that in the past extensions have been setup so
that a local vendor directory will be used if it is present. That is at
least what adding the `composer -> true` flag to an instance of the
mediawiki::extension define triggers.
Change-Id: I94a8e97ecb3891448e55970dc9b45e14d6439d92
---
M puppet/modules/mediawiki/files/composer.local.json
M puppet/modules/role/manifests/antispoof.pp
2 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/57/387157/1
diff --git a/puppet/modules/mediawiki/files/composer.local.json
b/puppet/modules/mediawiki/files/composer.local.json
index 692c88f..2b239a4 100644
--- a/puppet/modules/mediawiki/files/composer.local.json
+++ b/puppet/modules/mediawiki/files/composer.local.json
@@ -1,9 +1,10 @@
{
- "extra": {
- "merge-plugin": {
- "include": [
- "../settings.d/composer/*.json"
- ]
- }
- }
+ "extra": {
+ "merge-plugin": {
+ "include": [
+ "extensions/*/composer.json",
+ "../settings.d/composer/*.json"
+ ]
+ }
+ }
}
diff --git a/puppet/modules/role/manifests/antispoof.pp
b/puppet/modules/role/manifests/antispoof.pp
index b6f1006..5b501b2 100644
--- a/puppet/modules/role/manifests/antispoof.pp
+++ b/puppet/modules/role/manifests/antispoof.pp
@@ -5,6 +5,7 @@
mediawiki::extension { 'AntiSpoof':
needs_update => true,
+ composer => true,
}
mediawiki::maintenance { 'populate_spoofuser':
--
To view, visit https://gerrit.wikimedia.org/r/387157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94a8e97ecb3891448e55970dc9b45e14d6439d92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
