Restrict fail2ban to evasive blocks instead of all 403 errors

[chef.git] / cookbooks / prometheus / templates / default / apache.erb

diff --git a/cookbooks/prometheus/templates/default/apache.erb b/cookbooks/prometheus/templates/default/apache.erb
index c20daa31e86d650082db11c5c6e067167bda98e1..af005314002b5ba7a96bc934850241f2ebb0c973 100644 (file)
--- a/cookbooks/prometheus/templates/default/apache.erb
+++ b/cookbooks/prometheus/templates/default/apache.erb
@@ -5,7 +5,7 @@
        ServerAlias prometheus.osm.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerAlias prometheus.osm.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/


@@ -16,7 +16,7 @@
        ServerName prometheus.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName prometheus.openstreetmap.org
        ServerAdmin webmaster@openstreetmap.org
 

-       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined
+       CustomLog /var/log/apache2/prometheus.openstreetmap.org-access.log combined_extended

        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        SSLEngine on
        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        SSLEngine on


@@ -40,10 +40,6 @@
 <% end -%>
        </Location>
 
 <% end -%>
        </Location>
 

-       <Location /alertmanager/api>
-               Require all denied
-       </Location>
-

        <Location /karma>
 <% @admin_hosts.each do |host| -%>
                Require ip <%= host %>
        <Location /karma>
 <% @admin_hosts.each do |host| -%>
                Require ip <%= host %>