Fix some issues with the previous change.

[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 157064b..8be28f0 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -90,7 +90,7 @@
   </Files>
 </Directory>
 
-<VirtualHost <%= vhost_listen %> >
+<Macro common-www-other.d.o>
    ServerName debian.org
    ServerAdmin webmaster@debian.org
 
@@ -119,6 +119,9 @@
    ServerAlias www.debian.eu
    ServerAlias debian.eu
 
+   ServerAlias www.debian.fi
+   ServerAlias debian.fi
+
    ServerAlias www.debian.com
    ServerAlias debian.com
 
@@ -141,14 +144,7 @@
    DocumentRoot <%= wwwdo_document_root %>/
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
-   #RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
-   #RewriteLogLevel 1
-
-   RewriteEngine on
-   RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-</VirtualHost>
-
-
+</Macro>
 
 <Macro common-www.d.o>
    ServerName www.debian.org
@@ -168,11 +164,11 @@
    RewriteRule ^/(?!devel/website/errors/)(.*/)?404\.(.+)\.html$ /devel/website/errors/404.$2.html [L]
 
 # the joys of backwards compatibility
-   RedirectPermanent /cgi-bin/cvsweb http://cvs.debian.org
-   RedirectPermanent /Lists-Archives http://lists.debian.org
-   RedirectPermanent /search http://search.debian.org
-   RedirectPermanent /Packages http://packages.debian.org
-   RedirectPermanent /lintian http://lintian.debian.org
+   RedirectPermanent /cgi-bin/cvsweb https://cvs.debian.org
+   RedirectPermanent /Lists-Archives https://lists.debian.org
+   RedirectPermanent /search https://search.debian.org
+   RedirectPermanent /Packages https://packages.debian.org
+   RedirectPermanent /lintian https://lintian.debian.org
 
    RedirectPermanent /SPI http://www.spi-inc.org
 #   RedirectPermanent /OpenHardware http://www.openhardware.org
@@ -180,9 +176,9 @@
 
    RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
    RewriteEngine on
-   RewriteRule ^/Bugs/db/pa/l([^/]+).html$ http://bugs.debian.org/$1
-   RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ http://bugs.debian.org/$1
-   RewriteRule ^/Bugs/db/ma/l([^/]+).html$ http://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1
+   RewriteRule ^/Bugs/db/pa/l([^/]+).html$ https://bugs.debian.org/$1
+   RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ https://bugs.debian.org/$1
+   RewriteRule ^/Bugs/db/ma/l([^/]+).html$ https://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1
 
    <IfModule mod_userdir.c>
       UserDir disabled
@@ -196,7 +192,7 @@
    RedirectPermanent /doc/packaging-manuals/packaging-tutorial /doc/manuals/packaging-tutorial
    RedirectPermanent /doc/prospective-packages /devel/wnpp/
    RedirectPermanent /devel/maintainer_contacts /intro/organization
-   RedirectPermanent /devel/debian-installer/gtk-frontend http://wiki.debian.org/DebianInstaller/GUI
+   RedirectPermanent /devel/debian-installer/gtk-frontend https://wiki.debian.org/DebianInstaller/GUI
    RedirectPermanent /zh/ /international/Chinese/
    RedirectPermanent /chinese/ /international/Chinese/
    RedirectPermanent /devel/help /devel/join/
@@ -238,6 +234,7 @@
    RedirectPermanent /releases/9 /releases/stretch
    RedirectPermanent /releases/10 /releases/buster
    RedirectPermanent /releases/unstable /releases/sid
+   RedirectPermanent /support/ /support
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
    RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
@@ -273,6 +270,7 @@
 # Canonical place for manuals under /doc/manuals/
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
+   RewriteRule ^/doc/manuals/?$ /doc/ [L,R=301]
 
 # Relocation of blends pages
    RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]
@@ -296,16 +294,22 @@
 </VirtualHost>
 
 
+<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/
+</VirtualHost>
 <VirtualHost <%= vhost_listen_443 %> >
-   ServerName debian.org
-   ServerAdmin webmaster@debian.org
+   Use common-www-other.d.o
 
    CustomLog /var/log/apache2/www-other-access.log privacyssl
    ErrorLog /var/log/apache2/www-other-error.log
 
    Redirect permanent / https://www.debian.org/
 
-
    Use common-debian-service-ssl www.debian.org
    Use common-ssl-HSTS
 </VirtualHost>