Add apt.buildd.d.o
[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb
index 0acb605..f3f6502 100644 (file)
@@ -9,6 +9,39 @@
        Redirect /debian-ports/     http://cdn-fastly.deb.debian.org/debian-ports/
        Redirect /debian-security/  http://cdn-fastly.deb.debian.org/debian-security/
 </Macro>
+
+<VirtualHost <%= vhost_listen_443 %> >
+       ServerName deb.debian.org
+
+       ErrorLog /var/log/apache2/deb.debian.org-error.log
+       CustomLog /var/log/apache2/deb.debian.org-access.log privacyssl
+
+       Use common-debian-service-ssl deb.debian.org
+       Use common-ssl-HSTS
+
+       ServerAdmin debian-admin@lists.debian.org
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+       ServerSignature On
+
+       DocumentRoot /srv/static.debian.org/mirrors/deb.debian.org/cur
+       <Directory /srv/static.debian.org/mirrors/deb.debian.org/cur>
+               AllowOverride FileInfo Indexes Options=Multiviews
+               Options Indexes SymLinksIfOwnerMatch
+               IndexOptions FancyIndexing NameWidth=*
+               Require all granted
+       </Directory>
+
+       Header set Surrogate-Key <%= hostname %>
+
+       AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+
+       Redirect /debian/           https://cdn-aws.deb.debian.org/debian/
+       Redirect /debian-debug/     https://cdn-aws.deb.debian.org/debian-debug/
+       Redirect /debian-ports/     https://cdn-aws.deb.debian.org/debian-ports/
+       Redirect /debian-security/  https://cdn-aws.deb.debian.org/debian-security/
+</VirtualHost>
 <% end -%>
 
 <Macro vstatic-vhost-extra-network-test.debian.org>
                        ForceType text/plain
                        AddDefaultCharset utf-8
                </Files>
+               <Files *.debdiff.html.gz>
+                       ForceType text/html
+                       AddDefaultCharset utf-8
+               </Files>
        </Directory>
 </Macro>
 
@@ -158,6 +195,7 @@ vhost(lines, "wnpp-by-tags.debian.net"       , :ssl => true)
 vhost(lines, "security-team.debian.org"      , :ssl => true)
 vhost(lines, "d-i.debian.org"                , :ssl => true)
 vhost(lines, "appstream.debian.org"          , :ssl => true)
+vhost(lines, "apt.buildd.debian.org"         , :ssl => true)
 vhost(lines, "dsa.debian.org"                , :ssl => true)
 vhost(lines, "rtc.debian.org"                , :ssl => true)
 vhost(lines, "onion.debian.org"              , :ssl => true)
@@ -269,4 +307,10 @@ lines.join("\n")
        RedirectPermanent / http://metadata.ftp-master.debian.org/
 </VirtualHost>
 
+<VirtualHost <%= vhost_listen %> >
+       ServerName backports-master.debian.org
+       ServerAdmin debian-admin@debian.org
+       RedirectPermanent / https://backports.debian.org/
+</VirtualHost>
+
 # vim:ft=apache: