X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=3442b9fce1774deec2232493bb609ec3f2a3a5e4;hb=b1f236195b151cc975e54767b83e5fa8c54dd0f4;hp=7a2863b5a98411d289423da87f6ae5148c8b1eef;hpb=8a050c1f2563376a05350bc6221b5098ff515201;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 7a2863b5a..3442b9fce 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,6 +10,10 @@
# Make sure that the srm.conf directive is commented out.
AddDefaultCharSet Off
AllowOverride AuthConfig FileInfo
+ <% if @lsbmajdistrelease > '7' -%>
+ Require all granted
+ <% end -%>
+
# Serve icons as image/x-icon
AddType image/x-icon .ico
@@ -86,7 +90,7 @@
- >
+
ServerName debian.org
ServerAdmin webmaster@debian.org
@@ -115,6 +119,12 @@
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
@@ -127,6 +137,9 @@
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
@@ -134,14 +147,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]
-
-
-
+
ServerName www.debian.org
@@ -161,11 +167,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
@@ -173,9 +179,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
UserDir disabled
@@ -189,7 +195,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/
@@ -206,11 +212,15 @@
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/mirrors_full.html /mirror/list-full.html
RedirectPermanent /mirrors /mirror
RedirectPermanent /News/project /News/weekly
@@ -224,7 +234,10 @@
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
RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
@@ -260,6 +273,10 @@
# 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]
@@ -280,16 +297,22 @@
+ >
+ 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/
+
>
- ServerName debian.org
- ServerAdmin webmaster@debian.org
+ Use common-www-other.d.o
- CustomLog /var/log/apache2/www-other-access.log privacy
+ 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