BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401898 )
Change subject: wikimediaproduction: Remove duplicate declaration conflicts
......................................................................
wikimediaproduction: Remove duplicate declaration conflicts
Remove duplicate declaration errors caused by included roles that
attempted to install the same extensions.
* Include role::globalusage in role::commons
* Move some configuration from role::commons to role::globalusage
* Include role::labeledsectiontransclusion in role::proofreadpage
Bug: T184153
Change-Id: I3d18c2c5a75f84810769ba377bca122e41c8493d
---
M puppet/modules/role/manifests/commons.pp
M puppet/modules/role/manifests/globalusage.pp
M puppet/modules/role/manifests/proofreadpage.pp
3 files changed, 16 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/98/401898/1
diff --git a/puppet/modules/role/manifests/commons.pp
b/puppet/modules/role/manifests/commons.pp
index 8f67e6b..6ae76ff 100644
--- a/puppet/modules/role/manifests/commons.pp
+++ b/puppet/modules/role/manifests/commons.pp
@@ -8,6 +8,7 @@
class role::commons(
$upload_dir,
) {
+ include ::role::globalusage
require ::role::mediawiki
include ::role::multimedia
include ::role::thumb_on_404
@@ -29,17 +30,9 @@
values => template('role/commons/foreign_repo.php.erb'),
}
- mediawiki::extension { 'GlobalUsage':
- needs_update => true,
- settings => {
+ mediawiki::settings { 'commons_GlobalUsage':
+ values => {
wgGlobalUsageDatabase => 'commonswiki',
- },
- require => Mediawiki::Wiki['commons'],
- }
-
- mediawiki::maintenance { 'refresh globalusage table':
- command => '/usr/local/bin/foreachwikiwithextension GlobalUsage
extensions/GlobalUsage/refreshGlobalimagelinks.php --pages
existing,nonexisting',
- cwd => $::mediawiki::dir,
- require => Mediawiki::Extension['GlobalUsage'],
+ }
}
}
diff --git a/puppet/modules/role/manifests/globalusage.pp
b/puppet/modules/role/manifests/globalusage.pp
index 9040f41..835a16e 100644
--- a/puppet/modules/role/manifests/globalusage.pp
+++ b/puppet/modules/role/manifests/globalusage.pp
@@ -2,5 +2,15 @@
# Configures a MediaWiki instance with
# GlobalUsage[https://www.mediawiki.org/wiki/Extension:GlobalUsage]
class role::globalusage {
- mediawiki::extension { 'GlobalUsage': }
+ require ::role::mediawiki
+
+ mediawiki::extension { 'GlobalUsage':
+ needs_update => true,
+ }
+
+ mediawiki::maintenance { 'refresh globalusage table':
+ command => '/usr/local/bin/foreachwikiwithextension GlobalUsage
extensions/GlobalUsage/refreshGlobalimagelinks.php --pages
existing,nonexisting',
+ cwd => $::mediawiki::dir,
+ require => Mediawiki::Extension['GlobalUsage'],
+ }
}
diff --git a/puppet/modules/role/manifests/proofreadpage.pp
b/puppet/modules/role/manifests/proofreadpage.pp
index 037fb76..57ff45d 100644
--- a/puppet/modules/role/manifests/proofreadpage.pp
+++ b/puppet/modules/role/manifests/proofreadpage.pp
@@ -3,6 +3,7 @@
# a text in comparison with scanned images.
class role::proofreadpage {
include ::role::parserfunctions
+ include ::role::labeledsectiontransclusion
include ::role::cite
require_package('djvulibre-bin')
@@ -15,8 +16,6 @@
post_max_size => '50M',
},
}
-
- mediawiki::extension { 'LabeledSectionTransclusion': }
mediawiki::extension { 'ProofreadPage':
needs_update => true,
--
To view, visit https://gerrit.wikimedia.org/r/401898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d18c2c5a75f84810769ba377bca122e41c8493d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
