Remove otrs test role from naga

[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 e6290caedeb789ee7296eb2face75c1b4c0e6533..f03cf104966d7d52cbba1980bf1be759380b9bf7 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,22 +16,24 @@
        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
        SSLCertificateFile /etc/ssl/certs/prometheus.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/prometheus.openstreetmap.org.key
 
        ErrorLog /var/log/apache2/prometheus.openstreetmap.org-error.log
 
        SSLEngine on
        SSLCertificateFile /etc/ssl/certs/prometheus.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/prometheus.openstreetmap.org.key
 

-       Redirect 403 /prometheus/api/v1/admin

        ProxyPass /prometheus http://localhost:9090/prometheus
        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
 
        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
 

+       <Location /prometheus/api/v1/admin>
+               Require all denied
+       </Location>
+

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


@@ -44,3 +46,30 @@
 <% end -%>
        </Location>
 </VirtualHost>
 <% end -%>
        </Location>
 </VirtualHost>

+
+<VirtualHost *:80>
+  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/
+</VirtualHost>
+
+<VirtualHost *:443>
+  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/
+</VirtualHost>