[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikidata: Install wikibase using individual extensions

2017-12-31 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400999 )

Change subject: wikidata: Install wikibase using individual extensions
..


wikidata: Install wikibase using individual extensions

The wikidatabuild repo has been deprecated and is no longer being
updated. Change install method to provision individual extensions as is
now done in the Wikimedia production deployment.

Bug: T181769
Bug: T183307
Co-Authored-By: Bryan Davis 
Change-Id: I3e90b08e518505b0af1b57dda73b4b690627
---
M puppet/modules/role/manifests/wikidata.pp
M puppet/modules/role/templates/wikidata/init.php.erb
M puppet/modules/role/templates/wikidata/shared.php.erb
3 files changed, 114 insertions(+), 51 deletions(-)

Approvals:
  BryanDavis: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/role/manifests/wikidata.pp 
b/puppet/modules/role/manifests/wikidata.pp
index 9ef3ada..8bfcb87 100644
--- a/puppet/modules/role/manifests/wikidata.pp
+++ b/puppet/modules/role/manifests/wikidata.pp
@@ -12,7 +12,67 @@
 include ::role::sitematrix
 include ::role::langwikis
 
-mediawiki::wiki { 'wikidata': }
+mediawiki::wiki { 'wikidata':
+wgconf => {
+'wmvExtensions' => {
+  'ArticlePlaceholder' => false,
+},
+},
+}
+
+# Bootstrapping settings
+mediawiki::settings { 'WikiData-Init':
+priority => $::load_early,
+values   => template('role/wikidata/init.php.erb'),
+}
+
+# Note composer installing all of the extensions will run into duplicate
+# libs being installed. The first one that is loaded will actually be
+# used, in theory we could run into issues here but as long as each
+# extension is checked out at the same time / to the same version there
+# shouldnt be issues...
+
+# NOTE: there is always a wikibase_repo role, maybe we should use that?
+mediawiki::extension { 'Wikibase':
+composer => true,
+needs_update => true,
+settings => template('role/wikidata/shared.php.erb'),
+}
+
+mediawiki::extension { 'Wikidata.org':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'PropertySuggester':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'WikibaseQuality':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'WikibaseQualityConstraints':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'WikimediaBadges':
+needs_update => true,
+}
+
+mediawiki::extension { 'ArticlePlaceholder':
+needs_update => true,
+}
+
+mediawiki::maintenance { 'wikidata-populate-site-tables':
+command => "/usr/local/bin/foreachwikiwithextension Wikibase 
extensions/Wikibase/lib/maintenance/populateSitesTable.php --load-from 
http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php;,
+refreshonly => true,
+}
+
+Mediawiki::Wiki<| |> ~> 
Mediawiki::Maintenance['wikidata-populate-site-tables']
 
 # TODO: Going to http://wikidata.wiki.local.wmftest.net:8080/
 # will work, but if you explicitly visit Main_Page in the main
@@ -31,32 +91,4 @@
 wiki=> 'wikidata',
 db_name => 'wikidatawiki',
 }
-
-mediawiki::extension { 'WikidataBuildResources':
-remote   => 
'https://gerrit.wikimedia.org/r/wikidata/build-resources',
-entrypoint   => 'Wikidata.php',
-composer => true,
-needs_update => true,
-settings => template('role/wikidata/shared.php.erb'),
-}
-
-mediawiki::settings { 'WikiData-Init':
-priority => $::load_early,
-values   => template('role/wikidata/init.php.erb'),
-}
-
-exec { 'wikidata-update-git-remote':
-command => '/usr/bin/git remote set-url origin 
https://gerrit.wikimedia.org/r/wikidata/build-resources',
-unless  => "/usr/bin/git remote -v | grep -q 
'https://gerrit.wikimedia.org/r/wikidata/build-resources'",
-cwd => "${::mediawiki::dir}/extensions/WikidataBuildResources",
-require => Mediawiki::Extension['WikidataBuildResources'],
-}
-
-mediawiki::maintenance { 'wikidata-populate-site-tables':
-command => "/usr/local/bin/foreachwikiwithextension 
WikidataBuildResources 
extensions/WikidataBuildResources/extensions/Wikibase/lib/maintenance/populateSitesTable.php
 --load-from 
http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php;,
-refreshonly => true,
-}
-
-Mediawiki::Wiki<| |> ~> 
Mediawiki::Maintenance['wikidata-populate-site-tables']
-
 }
diff --git a/puppet/modules/role/templates/wikidata/init.php.erb

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikidata: Install wikibase using individual extensions

2017-12-29 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400999 )

Change subject: wikidata: Install wikibase using individual extensions
..

wikidata: Install wikibase using individual extensions

The wikidatabuild repo has been deprecated and is no longer being
updated. Change install method to provision individual extensions as is
now done in the Wikimedia production deployment.

Bug: T181769
Bug: T183307
Co-Authored-By: Bryan Davis 
Change-Id: I3e90b08e518505b0af1b57dda73b4b690627
---
M puppet/modules/role/manifests/wikidata.pp
M puppet/modules/role/templates/wikidata/init.php.erb
M puppet/modules/role/templates/wikidata/shared.php.erb
3 files changed, 114 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/99/400999/1

diff --git a/puppet/modules/role/manifests/wikidata.pp 
b/puppet/modules/role/manifests/wikidata.pp
index 9ef3ada..8bfcb87 100644
--- a/puppet/modules/role/manifests/wikidata.pp
+++ b/puppet/modules/role/manifests/wikidata.pp
@@ -12,7 +12,67 @@
 include ::role::sitematrix
 include ::role::langwikis
 
-mediawiki::wiki { 'wikidata': }
+mediawiki::wiki { 'wikidata':
+wgconf => {
+'wmvExtensions' => {
+  'ArticlePlaceholder' => false,
+},
+},
+}
+
+# Bootstrapping settings
+mediawiki::settings { 'WikiData-Init':
+priority => $::load_early,
+values   => template('role/wikidata/init.php.erb'),
+}
+
+# Note composer installing all of the extensions will run into duplicate
+# libs being installed. The first one that is loaded will actually be
+# used, in theory we could run into issues here but as long as each
+# extension is checked out at the same time / to the same version there
+# shouldnt be issues...
+
+# NOTE: there is always a wikibase_repo role, maybe we should use that?
+mediawiki::extension { 'Wikibase':
+composer => true,
+needs_update => true,
+settings => template('role/wikidata/shared.php.erb'),
+}
+
+mediawiki::extension { 'Wikidata.org':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'PropertySuggester':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'WikibaseQuality':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'WikibaseQualityConstraints':
+needs_update => true,
+wiki => 'wikidata',
+}
+
+mediawiki::extension { 'WikimediaBadges':
+needs_update => true,
+}
+
+mediawiki::extension { 'ArticlePlaceholder':
+needs_update => true,
+}
+
+mediawiki::maintenance { 'wikidata-populate-site-tables':
+command => "/usr/local/bin/foreachwikiwithextension Wikibase 
extensions/Wikibase/lib/maintenance/populateSitesTable.php --load-from 
http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php;,
+refreshonly => true,
+}
+
+Mediawiki::Wiki<| |> ~> 
Mediawiki::Maintenance['wikidata-populate-site-tables']
 
 # TODO: Going to http://wikidata.wiki.local.wmftest.net:8080/
 # will work, but if you explicitly visit Main_Page in the main
@@ -31,32 +91,4 @@
 wiki=> 'wikidata',
 db_name => 'wikidatawiki',
 }
-
-mediawiki::extension { 'WikidataBuildResources':
-remote   => 
'https://gerrit.wikimedia.org/r/wikidata/build-resources',
-entrypoint   => 'Wikidata.php',
-composer => true,
-needs_update => true,
-settings => template('role/wikidata/shared.php.erb'),
-}
-
-mediawiki::settings { 'WikiData-Init':
-priority => $::load_early,
-values   => template('role/wikidata/init.php.erb'),
-}
-
-exec { 'wikidata-update-git-remote':
-command => '/usr/bin/git remote set-url origin 
https://gerrit.wikimedia.org/r/wikidata/build-resources',
-unless  => "/usr/bin/git remote -v | grep -q 
'https://gerrit.wikimedia.org/r/wikidata/build-resources'",
-cwd => "${::mediawiki::dir}/extensions/WikidataBuildResources",
-require => Mediawiki::Extension['WikidataBuildResources'],
-}
-
-mediawiki::maintenance { 'wikidata-populate-site-tables':
-command => "/usr/local/bin/foreachwikiwithextension 
WikidataBuildResources 
extensions/WikidataBuildResources/extensions/Wikibase/lib/maintenance/populateSitesTable.php
 --load-from 
http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php;,
-refreshonly => true,
-}
-
-Mediawiki::Wiki<| |> ~> 
Mediawiki::Maintenance['wikidata-populate-site-tables']
-
 }
diff --git a/puppet/modules/role/templates/wikidata/init.php.erb