Dzahn has submitted this change and it was merged.

Change subject: mailman: fix Apache 2.4 require syntax pt.2
......................................................................


mailman: fix Apache 2.4 require syntax pt.2

one more follow-up to I2c70d87922bcc65

Syntax error on line 27 ..
negative Require directive has no effect in <RequireAny> directive

<snip>
When multiple Require directives are used in a single configuration
section and are not contained in another authorization directive like
<RequireAll>, they are implicitly contained within a <RequireAny> directive.

Thus the first one to authorize a user authorizes the entire request,
and subsequent Require directives are ignored.
</snip>

http://httpd.apache.org/docs/current/mod/mod_authz_core.html

Change-Id: I25ff59808fcb077b3611637bf19cb7699163d755
---
M modules/mailman/templates/lists.wikimedia.org.erb
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index 795c6b1..e3d98e5 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -20,8 +20,10 @@
     BrowserMatch "ArchiveTeam ArchiveBot" bad_browser
     <Location />
         <IfVersion >= 2.4>
-            Require all granted
-            Require not env bad_browser
+            <RequireAll>
+                Require all granted
+                Require not env bad_browser
+            </RequireAll>
         </IfVersion>
         <IfVersion < 2.4>
             Order allow,deny

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25ff59808fcb077b3611637bf19cb7699163d755
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: John F. Lewis <johnflewi...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to