jenkins-bot has submitted this change and it was merged.

Change subject: Add configuration variables documentation to GlobalBlocking.php
......................................................................


Add configuration variables documentation to GlobalBlocking.php

Follow-up to I7a8c83053b0f89a34a96a063de4727c712423b25

Change-Id: Ib01285e7c515cc6792143154a5bbef105d868750
---
M GlobalBlocking.php
1 file changed, 24 insertions(+), 0 deletions(-)

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



diff --git a/GlobalBlocking.php b/GlobalBlocking.php
index de60a7b..e1114f2 100644
--- a/GlobalBlocking.php
+++ b/GlobalBlocking.php
@@ -14,3 +14,27 @@
 } else {
        die( 'This version of the GlobalBlocking extension requires MediaWiki 
1.25+' );
 }
+
+// Global declarations and documentation kept for IDEs and PHP documentors.
+// This code is never executed.
+
+/**
+ * Database name you keep global blocking data in.
+ *
+ * If this is not on the primary database connection, don't forget
+ * to also set up $wgDBservers to have an entry with a groupLoads
+ * setting for the 'globalblocking' group.
+ */
+$wgGlobalBlockingDatabase = 'globalblocking';
+
+/**
+ * Whether to respect global blocks on this wiki. This is used so that
+ * global blocks can be set one one wiki, but not actually applied there
+ * (i.e. so people can contest them on that wiki).
+ */
+$wgApplyGlobalBlocks = true;
+
+/**
+ * Whether to block a request if an IP in the XFF is blocked
+ */
+$wgGlobalBlockingBlockXFF = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib01285e7c515cc6792143154a5bbef105d868750
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to