Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki::web: compatability fixes for apache2.conf
......................................................................
mediawiki::web: compatability fixes for apache2.conf
* Don't use 'LockFile' on 2.4; the directive does not exist.
* If an Options directive qualifies an option with '+' or '-', it must do so
for all options.
Change-Id: I5afba2c6b0fbf90ff8495cc4a82f5c7851893b52
---
M modules/mediawiki/files/apache/apache2.conf
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/apache2.conf
b/modules/mediawiki/files/apache/apache2.conf
index b189410..f63e605 100644
--- a/modules/mediawiki/files/apache/apache2.conf
+++ b/modules/mediawiki/files/apache/apache2.conf
@@ -3,7 +3,9 @@
ServerRoot "/etc/apache2"
#LockFile /usr/local/apache/logs/httpd.lock
PidFile /var/run/apache2.pid
-LockFile /var/lock/apache2/accept.lock
+<IfVersion < 2.4>
+ LockFile /var/lock/apache2/accept.lock
+</IfVersion>
#ResourceConfig conf/srm.conf
#AccessConfig conf/access.conf
@@ -65,7 +67,7 @@
</Directory>
<Directory "/usr/local/apache/common/docroot/default">
- Options -Indexes FollowSymLinks MultiViews
+ Options -Indexes +FollowSymLinks +MultiViews
AllowOverride None
Order allow,deny
--
To view, visit https://gerrit.wikimedia.org/r/147994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5afba2c6b0fbf90ff8495cc4a82f5c7851893b52
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
