X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e5dcd3ae4542c09c663e3648b474f2b227801e36..79409f0ab79d2377ea3777a262329ec6e70d326e:/cookbooks/munin/templates/default/apache.erb?ds=sidebyside
diff --git a/cookbooks/munin/templates/default/apache.erb b/cookbooks/munin/templates/default/apache.erb
index 77a215704..ed922b34a 100644
--- a/cookbooks/munin/templates/default/apache.erb
+++ b/cookbooks/munin/templates/default/apache.erb
@@ -1,59 +1,59 @@
# DO NOT EDIT - This file is being maintained by Chef
- ServerName munin.openstreetmap.org
- ServerAlias munin.osm.org
- ServerAdmin webmaster@openstreetmap.org
+ ServerName munin.openstreetmap.org
+ ServerAlias munin.osm.org
+ ServerAdmin webmaster@openstreetmap.org
- CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
- ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
+ CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
+ ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/munin.openstreetmap.org.pem
- SSLCertificateKeyFile /etc/ssl/private/munin.openstreetmap.org.key
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/munin.openstreetmap.org.pem
+ SSLCertificateKeyFile /etc/ssl/private/munin.openstreetmap.org.key
- SetEnv RRDCACHED_ADDRESS /var/run/rrdcached.sock
+ SetEnv RRDCACHED_ADDRESS /var/run/rrdcached.sock
- DocumentRoot /srv/munin.openstreetmap.org
- Alias /static/favicon.ico /srv/munin.openstreetmap.org/favicon.ico
- Alias /static/ /etc/munin/static/
- ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/
+ DocumentRoot /srv/munin.openstreetmap.org
+ Alias /static/favicon.ico /srv/munin.openstreetmap.org/favicon.ico
+ Alias /static/ /etc/munin/static/
+ ScriptAlias /munin-cgi/ /usr/lib/munin/cgi/
- # Remove Proxy request header to mitigate https://httpoxy.org/
- RequestHeader unset Proxy early
+ # Remove Proxy request header to mitigate https://httpoxy.org/
+ RequestHeader unset Proxy early
- RewriteEngine on
- RewriteCond %{REQUEST_URI} !^/static/
- RewriteCond %{REQUEST_URI} !^/dumps/
- RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
+ RewriteEngine on
+ RewriteCond %{REQUEST_URI} !^/static/
+ RewriteCond %{REQUEST_URI} !^/dumps/
+ RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
- ServerName munin.openstreetmap.org
- ServerAlias munin.osm.org
- ServerAdmin webmaster@openstreetmap.org
+ ServerName munin.openstreetmap.org
+ ServerAlias munin.osm.org
+ ServerAdmin webmaster@openstreetmap.org
- CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
- ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
+ CustomLog /var/log/apache2/munin.openstreetmap.org-access.log combined
+ ErrorLog /var/log/apache2/munin.openstreetmap.org-error.log
- RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
- RedirectPermanent / https://munin.openstreetmap.org/
+ RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+ RedirectPermanent / https://munin.openstreetmap.org/
- Require all granted
+ Require all granted
- Options +Indexes
+ Options +Indexes
- Require all granted
+ Require all granted
- Options +ExecCGI
- SetHandler fcgid-script
- Require all granted
+ Options +ExecCGI
+ SetHandler fcgid-script
+ Require all granted