X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f7da0cb544b61e318e0c54b5e2c8948d261ce358..9528de07d836fa814fd5b66dbe55aea20c9cff6c:/cookbooks/prometheus/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/prometheus/templates/default/apache.erb b/cookbooks/prometheus/templates/default/apache.erb index 1dead4474..af0053140 100644 --- 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 - 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/ @@ -16,7 +16,7 @@ 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 @@ -24,13 +24,16 @@ SSLCertificateKeyFile /etc/ssl/private/prometheus.openstreetmap.org.key ProxyPass /prometheus http://localhost:9090/prometheus - Redirect 403 /alertmanager/api ProxyPass /alertmanager http://localhost:9093/alertmanager ProxyPass /karma http://localhost:8081/karma ProxyPass /api/live/ws ws://localhost:3000/api/live/ws ProxyPass / http://localhost:3000/ ProxyPreserveHost on + + Require all denied + + <% @admin_hosts.each do |host| -%> Require ip <%= host %>