X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/93b82f6239bf810ecdb96241c7680628f5a7ebc9..f8a576aca1270f703f38c3257cf533390692de06:/cookbooks/prometheus/templates/default/apache.erb diff --git a/cookbooks/prometheus/templates/default/apache.erb b/cookbooks/prometheus/templates/default/apache.erb index edc1647af..f03cf1049 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,14 +24,52 @@ 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 %> <% end -%> + + +<% @admin_hosts.each do |host| -%> + Require ip <%= host %> +<% end -%> + + + + + ServerName munin.openstreetmap.org + ServerAlias munin.osm.org + ServerAdmin webmaster@openstreetmap.org + + CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined_extended + ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log + + RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/ + Redirect permanent / https://prometheus.openstreetmap.org/ + + + + ServerName munin.openstreetmap.org + ServerAlias munin.osm.org + ServerAdmin webmaster@openstreetmap.org + + CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined_extended + ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/prometheus.openstreetmap.org.pem + SSLCertificateKeyFile /etc/ssl/private/prometheus.openstreetmap.org.key + + Redirect permanent / https://prometheus.openstreetmap.org/