X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=197c60c379782a0e633d07d296bad79df530f3bd;hb=eedd9b7a5e400500547a9e40bb9bd2e415dfb701;hp=a83717a9b019797234c420c335f4cf724a388a07;hpb=d1e3825f8e98721af5ca75b35bedb0bb80aad263;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index a83717a9b..197c60c37 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -97,9 +97,6 @@
ServerAlias www.debian.eu
ServerAlias debian.eu
- ServerAlias www.debian.fi
- ServerAlias debian.fi
-
ServerAlias www.debian.nl
ServerAlias debian.nl
@@ -145,9 +142,9 @@
RedirectPermanent /Packages https://packages.debian.org
RedirectPermanent /lintian https://lintian.debian.org
- RedirectPermanent /SPI http://www.spi-inc.org
+ RedirectPermanent /SPI https://www.spi-inc.org
# RedirectPermanent /OpenHardware http://www.openhardware.org
- RedirectPermanent /OpenSource http://www.opensource.org
+ RedirectPermanent /OpenSource https://opensource.org
RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
RewriteEngine on
@@ -186,6 +183,7 @@
RedirectPermanent /ports/armhf /ports/arm
RedirectPermanent /ports/arm64 /ports/arm
RedirectPermanent /ports/mipsel /ports/mips
+ RedirectPermanent /ports/mips64el /ports/mips
RedirectPermanent /ports/kfreebsd-amd64 /ports/kfreebsd-gnu
RedirectPermanent /ports/kfreebsd-i386 /ports/kfreebsd-gnu
RedirectPermanent /ports/sparc64 /ports/sparc
@@ -193,6 +191,9 @@
RedirectPermanent /ports/ppc64 /ports/powerpc
RedirectPermanent /ports/ppc64el /ports/powerpc
RedirectPermanent /ports/powerpcspe /ports/powerpc
+ Redirect /ports/riscv64 https://wiki.debian.org/RISC-V
+ Redirect /ports/x32 https://wiki.debian.org/X32Port
+ Redirect /ports/sh4 https://wiki.debian.org/SH4
RedirectPermanent /mirror/official_sponsors /mirror/sponsors
RedirectPermanent /mirror/official /mirror/list
RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
@@ -213,10 +214,16 @@
RedirectPermanent /releases/unstable /releases/sid
RedirectPermanent /support/ /support
+# Upper-case URLs were a bad idea
+ RedirectPermanent /bugs /Bugs
+ RedirectPermanent /news /News
+ RedirectPermanent /mailinglists /MailingLists
+ RedirectPermanent /cd /CD
+
RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
- RewriteRule ^/devel/debian-installer/hooks(.*) http://d-i.alioth.debian.org/doc/internals/apb.html [R=301]
- RewriteRule ^/doc/packaging-manuals/mime-policy(.*) /doc/debian-policy/ch-opersys.html#s-mime [NE,R=301]
+ RewriteRule ^/devel/debian-installer/hooks(.*) https://d-i.alioth.debian.org/doc/internals/apb.html [R=301]
+ RewriteRule ^/doc/packaging-manuals/mime-policy(.*) /doc/debian-policy/ch-opersys.html#s-mime [NE,R=302]
RewriteRule ^/volatile/index.* - [S=1]
RewriteRule ^/volatile/.+ /volatile/ [L,R=301]
@@ -240,10 +247,25 @@
RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/footnotes$1 !-f
RewriteRule ^/doc/manuals/debian-reference/footnotes(.+) /doc/manuals/debian-reference/index$1 [L,R=301]
RewriteRule ^/doc/manuals/debian-reference/footnotes$ /doc/manuals/debian-reference/ [R=301]
+
+# DevRef filename changes c2016
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/scope(\.[a-z]{2})?.html $1/ch01$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/new-maintainer(\.[a-z]{2})?.html $1/ch02$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/developer-duties(\.[a-z]{2})?.html $1/ch03$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/resources(\.[a-z]{2})?.html $1/ch04$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/pkgs(\.[a-z]{2})?.html $1/ch05$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/best-pkging-practices(\.[a-z]{2})?.html $1/ch06$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/beyond-pkging(\.[a-z]{2})?.html $1/ch07$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/l10n(\.[a-z]{2})?.html $1/ch08$2.html
+ RedirectMatch permanent ^(/doc/manuals/developers-reference)/tools(\.[a-z]{2})?.html $1/apa$2.html
+
# New Maintainers' Guide
RewriteRule ^/doc/(manuals/)?maint-guide/ch-(.*) /doc/manuals/maint-guide/$2 [R=301]
RewriteRule ^/doc/(manuals/)?maint-guide/footnotes(.*) /doc/manuals/maint-guide/index$2 [R=301]
+# Compatibility after Debian Policy changed to build with Sphinx (bug #877367)
+ RewriteRule ^/doc/debian-policy/footnotes.html(.*) /doc/debian-policy/ [R=301,L]
+
# Canonical place for manuals under /doc/manuals/
RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
@@ -251,14 +273,14 @@
# 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]
- ServerName www.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 %>
+ ServerName <%= @wwwdo_server_name %>
Use common-www.d.o-inner
@@ -268,7 +290,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 <%= @wwwdo_server_name %>
+ Redirect / https://<%= @wwwdo_server_name %>/
>
ErrorLog /var/log/apache2/www.debian.org-error.log
@@ -276,11 +299,22 @@
Use common-www.d.o
- Use common-debian-service-ssl www.debian.org
+ Use common-debian-service-ssl <%= @wwwdo_server_name %>
Use common-ssl-HSTS
+<% if scope.function_onion_global_service_hostname([@wwwdo_server_name]) -%>
+ >
+ ErrorLog /var/log/apache2/www.debian.org-error.log
+ CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
+ ServerName <%= scope.function_onion_global_service_hostname([@wwwdo_server_name]) %>
+
+ Use common-www.d.o-inner
+
+<% end %>
+<%- if @redirect_vhosts -%>
# www other
###########
>
@@ -302,4 +336,5 @@
Use common-debian-service-ssl debian.org
Use common-ssl-HSTS
+<%- end -%>
# vim:set syn=apache: