X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=9227f34b8f26b8de8ea6152a6627e35a27c5ef1e;hb=16ad8be1b0d0f79a7e52a5a5c44f475641b5b0cc;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..9227f34b8 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -145,9 +145,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
@@ -213,10 +213,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/#multimedia-handlers [NE,R=302]
RewriteRule ^/volatile/index.* - [S=1]
RewriteRule ^/volatile/.+ /volatile/ [L,R=301]
@@ -244,6 +250,12 @@
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 single page manual (bug #877367)
+ RewriteRule ^/doc/debian-policy/ap-([^/]+).html(.*) /doc/debian-policy/#document-ap-$1 [NE,R=302]
+ RewriteRule ^/doc/debian-policy/ch-([^/]+).html(.*) /doc/debian-policy/#document-ch-$1 [NE,R=302]
+ RewriteRule ^/doc/debian-policy/upgrading-checklist.html(.*) /doc/debian-policy/#upgrading-checklist [NE,R=302]
+ RewriteRule ^/doc/debian-policy/footnotes.html(.*) /doc/debian-policy/ [R=302,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 +263,15 @@
# 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 %>
Use common-www.d.o-inner
@@ -268,7 +281,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/
>
ErrorLog /var/log/apache2/www.debian.org-error.log
@@ -280,6 +294,17 @@
Use common-ssl-HSTS
+<% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+ >
+ 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(['www.debian.org']) %>
+
+ Use common-www.d.o-inner
+
+<% end %>
+
# www other
###########