[MediaWiki-commits] [Gerrit] Add AntiSpam role - change (mediawiki/vagrant)

2013-10-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add AntiSpam role
..


Add AntiSpam role

Includes AntiSpoof, AbuseFilter and SpamBlacklist extensions

Change-Id: Id6c2d79d620af53e25b76178098bbceb8d2d510a
---
M puppet/manifests/roles.pp
1 file changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index c720409..4db69ea 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -548,3 +548,33 @@
 require  = Mediawiki::Extension['Interwiki'],
 }
 }
+
+# == Class: role::antispam
+# Installs and sets up AntiSpoof, AbuseFilter, and the SpamBlacklist extensions
+class role::antispam {
+include role::mediawiki
+
+@mediawiki::extension { 'AntiSpoof':
+needs_update = true,
+}
+
+@mediawiki::extension { 'AbuseFilter':
+needs_update = true,
+settings = [
+'$wgGroupPermissions[sysop][abusefilter-modify] = true',
+'$wgGroupPermissions[*][abusefilter-log-detail] = true',
+'$wgGroupPermissions[*][abusefilter-view] = true',
+'$wgGroupPermissions[*][abusefilter-log] = true',
+'$wgGroupPermissions[sysop][abusefilter-private] = true',
+'$wgGroupPermissions[sysop][abusefilter-modify-restricted] = 
true',
+'$wgGroupPermissions[sysop][abusefilter-revert] = true',
+],
+require = MediaWiki::Extension['AntiSpoof'],
+}
+
+@mediawiki::extension { 'SpamBlacklist':
+settings = {
+wgLogSpamBlacklistHits = true,
+},
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6c2d79d620af53e25b76178098bbceb8d2d510a
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add AntiSpam role - change (mediawiki/vagrant)

2013-10-06 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/88000


Change subject: Add AntiSpam role
..

Add AntiSpam role

Includes AntiSpoof, AbuseFilter and SpamBlacklist extensions

Change-Id: Id6c2d79d620af53e25b76178098bbceb8d2d510a
---
M puppet/manifests/roles.pp
1 file changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/00/88000/1

diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index c720409..28850a7 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -548,3 +548,30 @@
 require  = Mediawiki::Extension['Interwiki'],
 }
 }
+
+# == Class: role::antispam
+# Installs and sets up AntiSpoof, AbuseFilter, and the SpamBlacklist extensions
+class role::antispam {
+include role::mediawiki
+
+@mediawiki::extension { 'AntiSpoof':
+require  = MediaWiki::Extension['AntiSpoof'],
+}
+
+@mediawiki::extension { 'AbuseFilter':
+needs_update = true,
+settings = [
+'$wgGroupPermissions['sysop']['abusefilter-modify'] = true',
+'$wgGroupPermissions['*']['abusefilter-log-detail'] = true',
+'$wgGroupPermissions['*']['abusefilter-view'] = true',
+'$wgGroupPermissions['*']['abusefilter-log'] = true',
+'$wgGroupPermissions['sysop']['abusefilter-private'] = true',
+'$wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = 
true',
+'$wgGroupPermissions['sysop']['abusefilter-revert'] = true',
+],
+}
+
+@mediawiki::extension { 'SpamBlacklist':
+settings = [ '$wgLogSpamBlacklistHits = true' ],
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6c2d79d620af53e25b76178098bbceb8d2d510a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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