Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298041
Change subject: (WIP) make gerrit compatible with Apache 2.4
......................................................................
(WIP) make gerrit compatible with Apache 2.4
Change-Id: I8e30cfda0bd2e8d857f066d73fae6b87b4fb4eec
---
M modules/gerrit/templates/gerrit.wikimedia.org.erb
1 file changed, 15 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/298041/1
diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index 50ca2bc..8253750 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -21,8 +21,13 @@
<Directory /var/www/>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
- Order allow,deny
- allow from all
+ <IfVersion >= 2.4>
+ Require all granted
+ </IfVersion>
+ <IfVersion < 2.4>
+ Order allow,deny
+ allow from all
+ </IfVersion>
</Directory>
ErrorLog /var/log/apache2/error.log
@@ -69,8 +74,10 @@
<Directory />
Options FollowSymLinks
AllowOverride None
- Order deny,allow
- deny from env=bad_browser
+ <IfVersion < 2.4>
+ Order deny,allow
+ deny from env=bad_browser
+ </IfVersion>
</Directory>
<Directory /var/www/>
Options Indexes FollowSymLinks MultiViews
@@ -82,8 +89,10 @@
ProxyPreserveHost On
<Proxy *>
- Order deny,allow
- deny from env=bad_browser
+ <IfVersion < 2.4>
+ Order deny,allow
+ deny from env=bad_browser
+ </IfVersion>
</Proxy>
AllowEncodedSlashes On
--
To view, visit https://gerrit.wikimedia.org/r/298041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e30cfda0bd2e8d857f066d73fae6b87b4fb4eec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
