Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344113 )
Change subject: apache 2.4 compat for librenms/servermon/smokeping
......................................................................
apache 2.4 compat for librenms/servermon/smokeping
Bug: T125020
Change-Id: Ifb8c966392e3c1bf960d5df5554c21b75c67411f
---
M modules/librenms/templates/apache.conf.erb
M modules/role/templates/servermon/servermon.wikimedia.org.erb
M modules/smokeping/files/apache.conf
3 files changed, 18 insertions(+), 6 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/librenms/templates/apache.conf.erb
b/modules/librenms/templates/apache.conf.erb
index 33e5de6..85b56b4 100644
--- a/modules/librenms/templates/apache.conf.erb
+++ b/modules/librenms/templates/apache.conf.erb
@@ -23,8 +23,13 @@
<Directory <%= @install_dir %>/html>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
- Order allow,deny
- allow from all
+ <IfVersion < 2.4>
+ Order Allow,Deny
+ Allow From All
+ </IfVersion>
+ <IfVersion >= 2.4>
+ Require all granted
+ </IfVersion>
</Directory>
ErrorLog /var/log/apache2/<%= @sitename %>.error.log
diff --git a/modules/role/templates/servermon/servermon.wikimedia.org.erb
b/modules/role/templates/servermon/servermon.wikimedia.org.erb
index 58d342e..463adf9 100644
--- a/modules/role/templates/servermon/servermon.wikimedia.org.erb
+++ b/modules/role/templates/servermon/servermon.wikimedia.org.erb
@@ -15,8 +15,10 @@
</Directory>
<Location />
- Order Allow,Deny
- Allow from All
+ <IfVersion < 2.4>
+ Order Allow,Deny
+ Allow From All
+ </IfVersion>
AuthName "WMF Labs (use wiki login name not shell) - ops"
AuthType Basic
AuthBasicProvider ldap
diff --git a/modules/smokeping/files/apache.conf
b/modules/smokeping/files/apache.conf
index 0c63b26..d1a627a 100644
--- a/modules/smokeping/files/apache.conf
+++ b/modules/smokeping/files/apache.conf
@@ -13,8 +13,13 @@
<Directory /var/www>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
- Order allow,deny
- allow from all
+ <IfVersion < 2.4>
+ Order Allow,Deny
+ Allow From All
+ </IfVersion>
+ <IfVersion >= 2.4>
+ Require all granted
+ </IfVersion>
</Directory>
--
To view, visit https://gerrit.wikimedia.org/r/344113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb8c966392e3c1bf960d5df5554c21b75c67411f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
