Install userdir-ldap

[mirror/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 b9df975..21af9b1 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -8,10 +8,10 @@
        ServerAlias cdn.debian.net
        ServerAlias http.debian.net
 
-       Redirect /debian/           http://cdn-fastly.deb.debian.org/debian/
-       Redirect /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
-       Redirect /debian-ports/     http://cdn-fastly.deb.debian.org/debian-ports/
-       Redirect /debian-security/  http://cdn-fastly.deb.debian.org/debian-security/
+       Redirect /debian            http://cdn-fastly.deb.debian.org/debian
+       Redirect /debian-debug      http://cdn-fastly.deb.debian.org/debian-debug
+       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 %> >
@@ -40,15 +40,18 @@
 
        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/
+       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>
        ServerAlias network-test-backend.debian.org
+       <Location /nm>
+               Header set Cache-Control "must-revalidate, max-age=0"
+       </Location>
 </Macro>
 
 <Macro vstatic-vhost-extra-bits.debian.org>
@@ -78,6 +81,7 @@
        RewriteRule             ^/migration/testing.pl          /migration/cache/%2/%1.html [PT,L]
        RewriteRule             ^/migration/testing.pl          /migration/cache/_index.html
 
+       Alias /oldstable-proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/
        Alias /proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/
        <Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
                Require all granted
@@ -277,10 +281,20 @@ lines.join("\n")
        RedirectPermanent / http://ftp.ports.debian.org/
 </VirtualHost>
 
-<VirtualHost <%= @vhost_listen %> >
+<Macro vstatic-vhost-video.debian.net>
        ServerName video.debian.net
        ServerAdmin debian-admin@debian.org
-       Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+       Redirect / https://meetings-archive.debian.net/pub/debian-meetings/
+</Macro>
+
+<VirtualHost <%= @vhost_listen %> >
+       Use vstatic-vhost-video.debian.net
+</VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+       Use vstatic-vhost-video.debian.net
+       Use common-debian-service-ssl video.debian.net
+       Use common-ssl-HSTS
 </VirtualHost>
 
 # historical sites
@@ -328,4 +342,19 @@ lines.join("\n")
        Redirect / https://manpages.debian.org/
 </VirtualHost>
 
+# error pages
+#############
+
+Use common-dsa-vhost-https-redirect archive.debian.net
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName archive.debian.net
+       ServerAdmin debian-admin@debian.org
+       ErrorLog /var/log/apache2/archive.debian.net-error.log
+       CustomLog /var/log/apache2/archive.debian.net-access.log privacyssl
+       Use common-debian-service-ssl archive.debian.net
+       Use common-ssl-HSTS
+       Use common-disabled-service
+</VirtualHost>
+
+
 # vim:ft=apache: