Dzahn has submitted this change and it was merged.
Change subject: etherpad: make compatible with Apache 2.4
......................................................................
etherpad: make compatible with Apache 2.4
Like on I4c8e0aa365fbcc6 but only Etherpad
Needs to be there before Etherpad can move to jessie.
Change-Id: I8c47fe31b9dcbd65a400f9bd8010ef7f6b8ab143
---
M templates/misc/etherpad.wikimedia.org.erb
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/templates/misc/etherpad.wikimedia.org.erb
b/templates/misc/etherpad.wikimedia.org.erb
index 75946f4..4c3c580 100644
--- a/templates/misc/etherpad.wikimedia.org.erb
+++ b/templates/misc/etherpad.wikimedia.org.erb
@@ -45,8 +45,13 @@
<Proxy *>
Options FollowSymLinks MultiViews
AllowOverride All
- Order allow,deny
- Allow from all
+ <IfVersion >= 2.4>
+ Require all granted
+ </IfVersion>
+ <IfVersion < 2.4>
+ Order allow,deny
+ Allow from all
+ </IfVersion>
</Proxy>
</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/230686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c47fe31b9dcbd65a400f9bd8010ef7f6b8ab143
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
