Yuvipanda has submitted this change and it was merged. Change subject: trebuchet: Update deployment_server to support Apache 2.4 ......................................................................
trebuchet: Update deployment_server to support Apache 2.4 See http://httpd.apache.org/docs/2.4/upgrading.html#access Bug: T84956 Change-Id: I9527c6b20a1b8fe2de507d1d0b7f6a41ce3da78a --- M templates/apache/sites/deployment.erb 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: BryanDavis: Looks good to me, but someone else must approve Yuvipanda: Verified; Looks good to me, approved diff --git a/templates/apache/sites/deployment.erb b/templates/apache/sites/deployment.erb index 152ef5d..326a16e 100644 --- a/templates/apache/sites/deployment.erb +++ b/templates/apache/sites/deployment.erb @@ -6,8 +6,13 @@ <Directory /srv/deployment> Options Indexes FollowSymLinks MultiViews AllowOverride None - Order allow,deny - allow from <%= Array(@deployable_networks).join(' ') %> + <IfVersion >= 2.4> + Require ip <%= Array(@deployable_networks).join(' ') %> + </IfVersion> + <IfVersion < 2.4> + Order allow,deny + allow from <%= Array(@deployable_networks).join(' ') %> + </IfVersion> </Directory> LogLevel warn -- To view, visit https://gerrit.wikimedia.org/r/225554 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9527c6b20a1b8fe2de507d1d0b7f6a41ce3da78a Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gergő Tisza <[email protected]> Gerrit-Reviewer: BryanDavis <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Gergő Tisza <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
