web: add openstreetmap.com to certificate

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

diff --git a/cookbooks/piwik/templates/default/apache.erb b/cookbooks/piwik/templates/default/apache.erb
deleted file mode 100644 (file)
index 58703f4..0000000
--- a/cookbooks/piwik/templates/default/apache.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-<VirtualHost *:443>
-       ServerName piwik.openstreetmap.org
-       ServerAlias piwik.osm.org
-       ServerAdmin webmaster@openstreetmap.org
-
-       SSLEngine on
-       SSLCertificateFile /etc/ssl/certs/piwik.openstreetmap.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/piwik.openstreetmap.org.key
-
-       CustomLog /var/log/apache2/piwik.openstreetmap.org-access.log combined
-       ErrorLog /var/log/apache2/piwik.openstreetmap.org-error.log
-
-       Options -Indexes
-
-       DocumentRoot /srv/piwik.openstreetmap.org
-</VirtualHost>
-
-<VirtualHost *:80>
-       ServerName piwik.openstreetmap.org
-       ServerAlias piwik.osm.org
-       ServerAdmin webmaster@openstreetmap.org
-
-       CustomLog /var/log/apache2/piwik.openstreetmap.org-access.log combined
-       ErrorLog /var/log/apache2/piwik.openstreetmap.org-error.log
-
-       RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-       RedirectPermanent / https://piwik.openstreetmap.org/
-</VirtualHost>
-
-<Directory /srv/piwik.openstreetmap.org>
-       Require all granted
-
-       ExpiresActive On
-       RewriteEngine on
-
-       RewriteCond "%{HTTP:Accept-encoding}" "gzip"
-       RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-       RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA]
-
-       RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
-
-       <FilesMatch "\.js\.gz$">
-               Header append Content-Encoding gzip
-               Header append Vary Accept-Encoding
-       </FilesMatch>
-
-       <FilesMatch "(\.js|\.js\.gz)$">
-               ExpiresDefault "access plus 1 week"
-               Header set Cache-Control "max-age=604800"
-       </FilesMatch>
-</Directory>