The TCP BBR module is only available on stretch and later

[mirror/dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index a26b91e..b26d883 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -251,6 +251,10 @@
 
 # Relocation of blends pages
    RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]
+
+# Relocation of derivatives pages
+   RewriteRule ^/misc/children-distros(?:\.html)?$ /derivatives/ [R=301,L]
+   RewriteRule ^/misc/children-distros(\.[^\.]+(?:\.html)?)$ /derivatives/index$1 [R=301,L]
 </Macro>
 
 <Macro common-www.d.o>
@@ -265,7 +269,8 @@
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
-   Use common-www.d.o
+   ServerName www.debian.org
+   Redirect / https://www.debian.org/
 </VirtualHost>
 <VirtualHost <%= @vhost_listen_443 %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log