[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Update Reading Web roles

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

Change subject: Update Reading Web roles
..


Update Reading Web roles

* add RelatedArticles
* add WikidataPageBanner
* add QuickSurveys
* remove Gather

The roles uses the minimal required dependencies (relatedarticles
does not install BetaFeatures; wikidatapagebanner does not install
Wikibase or PageImages); those can be installed as separate roles
if needed.

Bug: T152036
Change-Id: I4f8567454b48c1a7ccddc9f1c72df3bc746159dd
---
D puppet/modules/role/manifests/gather.pp
A puppet/modules/role/manifests/quicksurveys.pp
A puppet/modules/role/manifests/relatedarticles.pp
A puppet/modules/role/manifests/wikidatapagebanner.pp
4 files changed, 49 insertions(+), 14 deletions(-)

Approvals:
  Bmansurov: Looks good to me, approved
  jenkins-bot: Verified
  Jhobs: Looks good to me, but someone else must approve
  Jdlrobson: Looks good to me, but someone else must approve



diff --git a/puppet/modules/role/manifests/gather.pp 
b/puppet/modules/role/manifests/gather.pp
deleted file mode 100644
index d0d360d..000
--- a/puppet/modules/role/manifests/gather.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# == Class: role::gather
-# Configures Gather, the MediaWiki extension which powers Special:Gather
-#
-class role::gather {
-include ::role::mediawiki
-include ::role::mobilefrontend
-include ::role::pageimages
-include ::role::textextracts
-
-mediawiki::extension { 'Gather':
-browser_tests => true,
-needs_update  => true,
-}
-}
diff --git a/puppet/modules/role/manifests/quicksurveys.pp 
b/puppet/modules/role/manifests/quicksurveys.pp
new file mode 100644
index 000..7e5c5ed
--- /dev/null
+++ b/puppet/modules/role/manifests/quicksurveys.pp
@@ -0,0 +1,14 @@
+# == Class: role::quicksurveys
+#
+# Installs the QuickSurveys[1] extension which shows simple, low-friction
+# in-article surveys.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:QuickSurveys
+#
+class role::quicksurveys {
+include role::eventlogging
+
+mediawiki::extension { 'QuickSurveys':
+needs_update => true,
+}
+}
diff --git a/puppet/modules/role/manifests/relatedarticles.pp 
b/puppet/modules/role/manifests/relatedarticles.pp
new file mode 100644
index 000..359a807
--- /dev/null
+++ b/puppet/modules/role/manifests/relatedarticles.pp
@@ -0,0 +1,20 @@
+# == Class: role::relatedarticles
+#
+# Installs the RelatedArticles[1] extension which shows some related
+# articles (based on content similarity, can be overriden via a parser
+# tag).
+#
+# [1] https://www.mediawiki.org/wiki/Extension:RelatedArticles
+#
+class role::relatedarticles {
+mediawiki::extension { 'RelatedArticles':
+settings => {
+wgRelatedArticlesShowInSidebar   => false,
+wgRelatedArticlesShowInFooter=> true,
+wgRelatedArticlesUseCirrusSearch => true,
+},
+require  => MediaWiki::Extension['Cards'],
+}
+
+mediawiki::extension { 'Cards': }
+}
diff --git a/puppet/modules/role/manifests/wikidatapagebanner.pp 
b/puppet/modules/role/manifests/wikidatapagebanner.pp
new file mode 100644
index 000..f603f8a
--- /dev/null
+++ b/puppet/modules/role/manifests/wikidatapagebanner.pp
@@ -0,0 +1,15 @@
+# == Class: role::wikidatapagebanner
+#
+# Installs the WikidataPageBanner[1] extension which adds banners on the top
+# of some wiki pages (taking file names from Wikidata, or a parser tag).
+#
+# [1] https://www.mediawiki.org/wiki/Extension:WikidataPageBanner
+#
+class role::wikidatapagebanner {
+mediawiki::extension { 'WikidataPageBanner':
+settings => {
+wgWPBBannerProperty  => 'P948',
+wgWPBEnableDefaultBanner => true,
+},
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/326241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f8567454b48c1a7ccddc9f1c72df3bc746159dd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhobs 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Update Reading Web roles

2016-12-09 Thread Code Review
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326241 )

Change subject: Update Reading Web roles
..

Update Reading Web roles

* add RelatedArticles
* add WikidataPageBanner
* add QuickSurveys
* remove Gather

The roles uses the minimal required dependencies (relatedarticles
does not install BetaFeatures; wikidatapagebanner does not install
Wikibase or PageImages); those can be installed as separate roles
if needed.

Bug: T152036
Change-Id: I4f8567454b48c1a7ccddc9f1c72df3bc746159dd
---
D puppet/modules/role/manifests/gather.pp
A puppet/modules/role/manifests/quicksurveys.pp
A puppet/modules/role/manifests/relatedarticles.pp
A puppet/modules/role/manifests/wikidatapagebanner.pp
4 files changed, 51 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/41/326241/1

diff --git a/puppet/modules/role/manifests/gather.pp 
b/puppet/modules/role/manifests/gather.pp
deleted file mode 100644
index d0d360d..000
--- a/puppet/modules/role/manifests/gather.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# == Class: role::gather
-# Configures Gather, the MediaWiki extension which powers Special:Gather
-#
-class role::gather {
-include ::role::mediawiki
-include ::role::mobilefrontend
-include ::role::pageimages
-include ::role::textextracts
-
-mediawiki::extension { 'Gather':
-browser_tests => true,
-needs_update  => true,
-}
-}
diff --git a/puppet/modules/role/manifests/quicksurveys.pp 
b/puppet/modules/role/manifests/quicksurveys.pp
new file mode 100644
index 000..7e5c5ed
--- /dev/null
+++ b/puppet/modules/role/manifests/quicksurveys.pp
@@ -0,0 +1,14 @@
+# == Class: role::quicksurveys
+#
+# Installs the QuickSurveys[1] extension which shows simple, low-friction
+# in-article surveys.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:QuickSurveys
+#
+class role::quicksurveys {
+include role::eventlogging
+
+mediawiki::extension { 'QuickSurveys':
+needs_update => true,
+}
+}
diff --git a/puppet/modules/role/manifests/relatedarticles.pp 
b/puppet/modules/role/manifests/relatedarticles.pp
new file mode 100644
index 000..79dd6a2
--- /dev/null
+++ b/puppet/modules/role/manifests/relatedarticles.pp
@@ -0,0 +1,22 @@
+# == Class: role::relatedarticles
+#
+# Installs the RelatedArticles[1] extension which shows some related
+# articles (based on content similarity, can be overriden via a parser
+# tag).
+#
+# [1] https://www.mediawiki.org/wiki/Extension:RelatedArticles
+#
+class role::relatedarticles {
+include role::cirrussearch
+
+mediawiki::extension { 'RelatedArticles':
+settings => {
+wgRelatedArticlesShowInSidebar => false,
+wgRelatedArticlesShowInFooter => true,
+wgRelatedArticlesUseCirrusSearch => true,
+},
+require => MediaWiki::Extension['Cards'],
+}
+
+mediawiki::extension { 'Cards': }
+}
diff --git a/puppet/modules/role/manifests/wikidatapagebanner.pp 
b/puppet/modules/role/manifests/wikidatapagebanner.pp
new file mode 100644
index 000..49ec88a
--- /dev/null
+++ b/puppet/modules/role/manifests/wikidatapagebanner.pp
@@ -0,0 +1,15 @@
+# == Class: role::wikidatapagebanner
+#
+# Installs the WikidataPageBanner[1] extension which adds banners on the top
+# of some wiki pages (taking file names from Wikidata, or a parser tag).
+#
+# [1] https://www.mediawiki.org/wiki/Extension:WikidataPageBanner
+#
+class role::wikidatapagebanner {
+mediawiki::extension { 'WikidataPageBanner':
+settings => {
+wgWPBBannerProperty => 'P948',
+wgWPBEnableDefaultBanner => true,
+},
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/326241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f8567454b48c1a7ccddc9f1c72df3bc746159dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits