projects / mirror / dsa-puppet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 db88d9c..dee348e 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -4,12 +4,13 @@
 ##
 
 # 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.
   AddDefaultCharSet Off
   AllowOverride AuthConfig FileInfo
+  Require all granted
 
   # Serve icons as image/x-icon
   AddType image/x-icon .ico
@@ -86,27 +87,45 @@
   </Files>
 </Directory>
 
-<VirtualHost <%= vhost_listen %> >
-   ServerName www.nl.debian.org
+<Macro common-www-other.d.o>
+   ServerName debian.org
    ServerAdmin webmaster@debian.org
-   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com
-   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>
+   ServerAlias www.debian.net
+   ServerAlias debian.net
 
-<VirtualHost <%= vhost_listen %> >
-   ServerName www.debian.org
+   ServerAlias www.debian.eu
+   ServerAlias debian.eu
+
+   ServerAlias www.debian.fi
+   ServerAlias debian.fi
+
+   ServerAlias www.debian.nl
+   ServerAlias debian.nl
+
+   ServerAlias www.debian.com
+   ServerAlias debian.com
+
+   ServerAlias debian.us
+   ServerAlias www.debian.us
+
+   ServerAlias debian.gr
+   ServerAlias www.debian.gr
+
+   ServerAlias www.debian.es
+   ServerAlias debian.es
+
+   ServerAlias www.debian.at
+
+   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-inner>
    ServerAdmin webmaster@debian.org
-   ServerAlias www-*.debian.org
-   DocumentRoot <%= wwwdo_document_root %>/
-   ErrorLog /var/log/apache2/www.debian.org-error.log
-   CustomLog /var/log/apache2/www.debian.org-access.log privacy
+   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
@@ -120,11 +139,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
@@ -132,9 +151,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
@@ -148,7 +167,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/
@@ -165,11 +184,17 @@
    RedirectPermanent /intl /international
    RedirectPermanent /ports/armel  /ports/arm
    RedirectPermanent /ports/armhf  /ports/arm
+   RedirectPermanent /ports/arm64  /ports/arm
    RedirectPermanent /ports/mipsel /ports/mips
    RedirectPermanent /ports/kfreebsd-amd64 /ports/kfreebsd-gnu
    RedirectPermanent /ports/kfreebsd-i386  /ports/kfreebsd-gnu
    RedirectPermanent /ports/sparc64 /ports/sparc
    RedirectPermanent /ports/s390x   /ports/s390
+   RedirectPermanent /ports/ppc64   /ports/powerpc
+   RedirectPermanent /ports/ppc64el   /ports/powerpc
+   RedirectPermanent /ports/powerpcspe   /ports/powerpc
+   RedirectPermanent /mirror/official_sponsors /mirror/sponsors
+   RedirectPermanent /mirror/official /mirror/list
    RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly
@@ -183,7 +208,11 @@
    RedirectPermanent /releases/6.0 /releases/squeeze
    RedirectPermanent /releases/7 /releases/wheezy
    RedirectPermanent /releases/8 /releases/jessie
+   RedirectPermanent /releases/9 /releases/stretch
+   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]
@@ -195,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
@@ -219,15 +248,72 @@
 # 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]
+
+# 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 %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
+   ServerName www.debian.org
+   Redirect / https://www.debian.org/
+</VirtualHost>
+<VirtualHost <%= @vhost_listen_443 %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
+
+   Use common-www.d.o
+
+   Use common-debian-service-ssl www.debian.org
+   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 volatile.debian.org
-   ServerAlias volatile-master.debian.org
-   ServerAdmin webmaster@debian.org
-   ErrorLog /var/log/apache2/volatile.debian.org-error.log
-   CustomLog /var/log/apache2/volatile.debian.org-access.log privacy
-   RedirectMatch permanent . http://www.debian.org/volatile/
+   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 / https://www.debian.org/
+</VirtualHost>
+<VirtualHost <%= @vhost_listen_443 %> >
+   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 debian.org
+   Use common-ssl-HSTS
 </VirtualHost>
+# vim:set syn=apache:
Unnamed repository; edit this file 'description' to name the repository.