[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikitech: use existing roles

2018-01-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401895 )

Change subject: wikitech: use existing roles
..


wikitech: use existing roles

Bug: T184155
Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
---
M puppet/modules/role/manifests/wikitech.pp
1 file changed, 6 insertions(+), 17 deletions(-)

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



diff --git a/puppet/modules/role/manifests/wikitech.pp 
b/puppet/modules/role/manifests/wikitech.pp
index c86a59b..4dea813 100644
--- a/puppet/modules/role/manifests/wikitech.pp
+++ b/puppet/modules/role/manifests/wikitech.pp
@@ -3,25 +3,20 @@
 # Provisions a MediaWiki instance similar to https://wikitech.wikimedia.org/.
 #
 class role::wikitech {
+include ::role::categorytree
+include ::role::checkuser
 include ::role::cite
 include ::role::codeeditor
 include ::role::echo
 include ::role::gadgets
+include ::role::nuke
+include ::role::oathauth
 include ::role::parserfunctions
+include ::role::renameuser
 include ::role::scribunto
+include ::role::titleblacklist
 include ::role::wikieditor
 include ::role::wikilove
-
-# Alas, if only SMW didn't require composer
-# mediawiki::extension { [ 'SemanticForms', 'SemanticResultFormats' ]:
-# needs_update  => true,
-# require   => Mediawiki::Extension[ 'SemanticMediaWiki' ],
-# }
-#
-# mediawiki::extension { 'SemanticMediaWiki':
-# needs_update  => true,
-# require   => Mediawiki::Extension['Validator'],
-# }
 
 mediawiki::extension { 'LdapAuthentication':
 needs_update => true,
@@ -44,15 +39,9 @@
 }
 
 mediawiki::extension { [
-'CategoryTree',
-'CheckUser',
 'Collection',
 'DynamicSidebar',
-'Nuke',
-'OATHAuth',
 'OpenStackManager',
-'Renameuser',
-'TitleBlacklist',
 ]:
 needs_update  => true,
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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[stretch-migration]: wikitech: use existing roles

2018-01-03 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401895 )

Change subject: wikitech: use existing roles
..

wikitech: use existing roles

Bug: T184155
Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
---
M puppet/modules/role/manifests/wikitech.pp
1 file changed, 6 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/95/401895/1

diff --git a/puppet/modules/role/manifests/wikitech.pp 
b/puppet/modules/role/manifests/wikitech.pp
index c86a59b..4dea813 100644
--- a/puppet/modules/role/manifests/wikitech.pp
+++ b/puppet/modules/role/manifests/wikitech.pp
@@ -3,25 +3,20 @@
 # Provisions a MediaWiki instance similar to https://wikitech.wikimedia.org/.
 #
 class role::wikitech {
+include ::role::categorytree
+include ::role::checkuser
 include ::role::cite
 include ::role::codeeditor
 include ::role::echo
 include ::role::gadgets
+include ::role::nuke
+include ::role::oathauth
 include ::role::parserfunctions
+include ::role::renameuser
 include ::role::scribunto
+include ::role::titleblacklist
 include ::role::wikieditor
 include ::role::wikilove
-
-# Alas, if only SMW didn't require composer
-# mediawiki::extension { [ 'SemanticForms', 'SemanticResultFormats' ]:
-# needs_update  => true,
-# require   => Mediawiki::Extension[ 'SemanticMediaWiki' ],
-# }
-#
-# mediawiki::extension { 'SemanticMediaWiki':
-# needs_update  => true,
-# require   => Mediawiki::Extension['Validator'],
-# }
 
 mediawiki::extension { 'LdapAuthentication':
 needs_update => true,
@@ -44,15 +39,9 @@
 }
 
 mediawiki::extension { [
-'CategoryTree',
-'CheckUser',
 'Collection',
 'DynamicSidebar',
-'Nuke',
-'OATHAuth',
 'OpenStackManager',
-'Renameuser',
-'TitleBlacklist',
 ]:
 needs_update  => true,
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b3d4a25238baa87b6b370d368a743122c7257a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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