Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247479
Change subject: Have Flow depend on antispam and checkuser
......................................................................
Have Flow depend on antispam and checkuser
This allows fewer PHPUnit tests to be skipped by default.
This revealed that TitleBlacklist was double-declared, so I factored
it out, keeping the one with the custom setting from antispam.
Change-Id: I7261faac5093a0e653856ab910b6ee59aabae4f1
---
M puppet/modules/role/manifests/antispam.pp
M puppet/modules/role/manifests/flow.pp
A puppet/modules/role/manifests/titleblacklist.pp
M puppet/modules/role/manifests/uploadwizard.pp
4 files changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/79/247479/1
diff --git a/puppet/modules/role/manifests/antispam.pp
b/puppet/modules/role/manifests/antispam.pp
index 2bcf3d8..7683553 100644
--- a/puppet/modules/role/manifests/antispam.pp
+++ b/puppet/modules/role/manifests/antispam.pp
@@ -3,6 +3,7 @@
# TitleBlacklist extensions
class role::antispam {
include ::role::antispoof
+ include ::role::titleblacklist
mediawiki::extension { 'AbuseFilter':
needs_update => true,
@@ -22,12 +23,6 @@
mediawiki::extension { 'SpamBlacklist':
settings => {
wgLogSpamBlacklistHits => true,
- },
- }
-
- mediawiki::extension { 'TitleBlacklist':
- settings => {
- wgTitleBlacklistLogHits => true,
},
}
}
diff --git a/puppet/modules/role/manifests/flow.pp
b/puppet/modules/role/manifests/flow.pp
index 8c4d225..e644a49 100644
--- a/puppet/modules/role/manifests/flow.pp
+++ b/puppet/modules/role/manifests/flow.pp
@@ -1,6 +1,8 @@
# == Class: role::flow
# Configures Flow, a MediaWiki discussion system.
class role::flow {
+ include ::role::antispam
+ include ::role::checkuser
include ::role::eventlogging
include ::role::parsoid
include ::role::echo
diff --git a/puppet/modules/role/manifests/titleblacklist.pp
b/puppet/modules/role/manifests/titleblacklist.pp
new file mode 100644
index 0000000..83bf7b9
--- /dev/null
+++ b/puppet/modules/role/manifests/titleblacklist.pp
@@ -0,0 +1,10 @@
+# == Class: role::titleblacklist
+# Allows blocking certain titles or usernames based
+# on regex.
+class role::titleblacklist {
+ mediawiki::extension { 'TitleBlacklist':
+ settings => {
+ wgTitleBlacklistLogHits => true,
+ },
+ }
+}
diff --git a/puppet/modules/role/manifests/uploadwizard.pp
b/puppet/modules/role/manifests/uploadwizard.pp
index 0086969..42c585a 100644
--- a/puppet/modules/role/manifests/uploadwizard.pp
+++ b/puppet/modules/role/manifests/uploadwizard.pp
@@ -7,6 +7,7 @@
include ::role::eventlogging
include ::role::multimedia
include ::role::codeeditor
+ include ::role::titleblacklist
# API smoke test dependencies
require_package('imagemagick')
@@ -14,8 +15,6 @@
require_package('python-poster')
mediawiki::extension { 'Campaigns': }
-
- mediawiki::extension { 'TitleBlacklist': }
mediawiki::extension { 'UploadWizard':
browser_tests => true,
--
To view, visit https://gerrit.wikimedia.org/r/247479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7261faac5093a0e653856ab910b6ee59aabae4f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
