X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=aee7380b1612f3386ac26c1b4c7eacd61cf99ce2;hb=18066df35f30b2cdb36d12ad84e9f1a5f911c7d4;hp=f124f48a7f0bb096fda001fa4b1c5e3bf18e3b6f;hpb=63df0543e44a07b3ebce0f4134897a239c192978;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 f124f48a7..aee7380b1 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -87,9 +87,33 @@
>
- ServerName www.nl.debian.org
+ 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
+
+ ServerAlias www.*.debian.org
+
+ ServerAlias www.debian.net
+ ServerAlias debian.net
+
+ ServerAlias www.debian.eu
+ ServerAlias debian.eu
+
+ 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
+ ServerAlias www.debian.de
+ ServerAlias newwww.deb.at
+
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
@@ -100,7 +124,9 @@
RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
- >
+
+
+
ServerName www.debian.org
ServerAdmin webmaster@debian.org
ServerAlias www-*.debian.org
@@ -164,10 +190,12 @@
RedirectPermanent /misc/README.non-US /mirror/list.non-US
RedirectPermanent /intl /international
RedirectPermanent /ports/armel /ports/arm
+ RedirectPermanent /ports/armhf /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 /mirror/mirrors_full.html /mirror/list-full.html
RedirectPermanent /mirrors /mirror
RedirectPermanent /News/project /News/weekly
@@ -217,15 +245,29 @@
# Canonical place for manuals under /doc/manuals/
RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
+
+
+
+ >
+ Use common-www.d.o
+
+ >
+ Use common-www.d.o
+ Use common-debian-service-ssl www.debian.org
+ Use common-ssl-HSTS
- >
- ServerName volatile.debian.org
- ServerAlias volatile-master.debian.org
+ >
+ ServerName 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/
+
+ CustomLog /var/log/apache2/www-other-access.log privacy
+ 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