Redirect debian.org/bugs to /Bugs (Closes: #883946)

[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 11e0ae4..dee348e 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -4,7 +4,7 @@
 ##
 
 # Need to turn on negotiation_module
-<Directory <%= wwwdo_document_root %>/>
+<Directory <%= @wwwdo_document_root %>/>
   Options +MultiViews +FollowSymLinks +Indexes
   AddHandler type-map var
   # Make sure that the srm.conf directive is commented out.
@@ -91,25 +91,6 @@
    ServerName debian.org
    ServerAdmin webmaster@debian.org
 
-   ServerAlias www.at.debian.org
-   ServerAlias www.au.debian.org
-   ServerAlias www.bg.debian.org
-   ServerAlias www.br.debian.org
-   ServerAlias www.cn.debian.org
-   ServerAlias www.de.debian.org
-   ServerAlias www.es.debian.org
-   ServerAlias www.fr.debian.org
-   ServerAlias www.hk.debian.org
-   ServerAlias www.id.debian.org
-   ServerAlias www.jp.debian.org
-   ServerAlias www.nl.debian.org
-   ServerAlias www.pl.debian.org
-   ServerAlias www.ru.debian.org
-   ServerAlias www.ua.debian.org
-   ServerAlias www.uk.debian.org
-   ServerAlias www.us.debian.org
-   ServerAlias www.za.debian.org
-
    ServerAlias www.debian.net
    ServerAlias debian.net
 
@@ -134,28 +115,17 @@
    ServerAlias www.debian.es
    ServerAlias debian.es
 
-   ServerAlias www.debian.org.tw
-   ServerAlias debian.org.tw
-
    ServerAlias www.debian.at
-   ServerAlias www.debian.de
-   ServerAlias newwww.deb.at
 
-   DocumentRoot <%= wwwdo_document_root %>/
+   DocumentRoot <%= @wwwdo_document_root %>/
    LogFormat "0.0.0.0 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %V" privacy+host
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy+host
 </Macro>
 
-<Macro common-www.d.o>
-   ServerName www.debian.org
+<Macro common-www.d.o-inner>
    ServerAdmin webmaster@debian.org
-   ServerAlias www-*.debian.org
-   <% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
-   ServerAlias <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
-   <% end %>
-
-   DocumentRoot <%= wwwdo_document_root %>/
+   DocumentRoot <%= @wwwdo_document_root %>/
 
    # CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
    # document that was negotiated on the basis of content. This asks proxy
@@ -242,6 +212,7 @@
    RedirectPermanent /releases/10 /releases/buster
    RedirectPermanent /releases/unstable /releases/sid
    RedirectPermanent /support/ /support
+   RedirectPermanent /bugs /Bugs
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
    RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
@@ -253,12 +224,12 @@
    RewriteRule ^/devel/debian-volatile/.* /volatile/ [R=301]
 
 # Offer a Redirect to DSA without knowing year #474730
-   RewriteMap dsa txt:<%= wwwdo_document_root %>/security/map-dsa.txt
+   RewriteMap dsa txt:<%= @wwwdo_document_root %>/security/map-dsa.txt
    RewriteRule ^/security/dsa-(\d+)(\..*)? /security/${dsa:$1}$2 [R=301]
 
 # Compatibility after SGML -> DocBook
 # Debian Reference #624239
-   RewriteMap reference txt:<%= wwwdo_document_root %>/doc/map-reference.txt
+   RewriteMap reference txt:<%= @wwwdo_document_root %>/doc/map-reference.txt
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/ch-support$1 !-f
    RewriteRule ^/doc/manuals/debian-reference/ch-support(.*)  /support$1 [L,R=301]
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/${reference:$1}$2 -f
@@ -281,16 +252,28 @@
 
 # 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>
+   ServerName www.debian.org
+   ServerAlias www-*.debian.org
+
+   Use common-www.d.o-inner
 </Macro>
 
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
    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 %> >
+<VirtualHost <%= @vhost_listen_443 %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
 
@@ -300,16 +283,29 @@
    Use common-ssl-HSTS
 </VirtualHost>
 
+<% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+<VirtualHost <%= @vhost_listen %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
-<VirtualHost <%= vhost_listen %> >
+   ServerName <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
+
+   Use common-www.d.o-inner
+</VirtualHost>
+<% end %>
+
+
+# www other
+###########
+<VirtualHost <%= @vhost_listen %> >
    Use common-www-other.d.o
 
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
 
-   Redirect permanent / http://www.debian.org/
+   Redirect permanent / https://www.debian.org/
 </VirtualHost>
-<VirtualHost <%= vhost_listen_443 %> >
+<VirtualHost <%= @vhost_listen_443 %> >
    Use common-www-other.d.o
 
    CustomLog /var/log/apache2/www-other-access.log privacyssl