Add timeline.debian.net to the static CDN

[dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 959ca519863cc0c63ee88a798ba7d312271e6b19..847b7a8b9f08b029c6e43354456b067bcae67d30 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -6,15 +6,30 @@ Use common-static-vhost incoming.debian.org
 Use common-static-vhost news.debian.net
 Use common-static-vhost debaday.debian.net
 Use common-static-vhost debdeltas.debian.net
-Use common-static-vhost-with-extra metadata.ftp-master.debian.org "AddDefaultCharset utf-8"
+Use common-static-vhost timeline.debian.net
 Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
 Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
 Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org"
 Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
+Use common-static-vhost-ssl appstream.debian.org
 Use common-static-vhost-ssl dsa.debian.org
 Use common-static-vhost-ssl rtc.debian.org
 Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org"
 
+# metadata.ftp-master.debian.org
+<VirtualHost <%= vhost_listen %> >
+       ServerName metadata.ftp-master.debian.org
+       ServerAdmin debian-admin@lists.debian.org
+
+       ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log
+       CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy
+
+       Use common-static-base metadata.ftp-master.debian.org
+       AddDefaultCharset utf-8
+       <LocationMatch "/changelogs/(main|contrib|non-free)">
+               ForceType text/plain
+       </LocationMatch>
+</VirtualHost>
 
 # bits.debian.org
 ######################
@@ -94,7 +109,6 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
                <% end -%>
        </Directory>
 
-       DefaultType text/plain
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
        AddOutputFilter INCLUDES .xhtml
 </VirtualHost>