X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=12d579368a0cd84425bb597c35b812d03b22aab8;hb=831c82c9a869cdb8beb678c7a52568568ef87129;hp=1578c8948cae03c937c76eeff9eee92b3551571b;hpb=678de195cb79b1a2297553fc17cbe042823e9044;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 1578c8948..12d579368 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -87,9 +87,53 @@
>
- 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 debian.us www.debian.us
+
+ ServerAlias www.at.debian.org
+ ServerAlias www.au.debian.org
+ ServerAlias www.bg.debian.org
+ ServerAlias www.br.debian.org
+ ServerAlias www.cn.debian.org
+ ServerAlias www.de.debian.org
+ ServerAlias www.es.debian.org
+ ServerAlias www.fr.debian.org
+ ServerAlias www.hk.debian.org
+ ServerAlias www.id.debian.org
+ ServerAlias www.jp.debian.org
+ ServerAlias www.nl.debian.org
+ ServerAlias www.pl.debian.org
+ ServerAlias www.ru.debian.org
+ ServerAlias www.ua.debian.org
+ ServerAlias www.uk.debian.org
+ ServerAlias www.us.debian.org
+ ServerAlias www.za.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.org.tw
+ ServerAlias debian.org.tw
+
+ 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,13 +144,13 @@
RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
- >
+
+
+
ServerName www.debian.org
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
# CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
# document that was negotiated on the basis of content. This asks proxy
@@ -183,6 +227,8 @@
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
RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
@@ -219,15 +265,36 @@
# Canonical place for manuals under /doc/manuals/
RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
+
+
+ >
+ ErrorLog /var/log/apache2/www.debian.org-error.log
+ CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
+ Use common-www.d.o
+ >
+ ErrorLog /var/log/apache2/www.debian.org-error.log
+ CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
+ Use common-www.d.o
- >
- ServerName volatile.debian.org
- ServerAlias volatile-master.debian.org
+ Use common-debian-service-ssl www.debian.org
+ Use common-ssl-HSTS
+
+
+
+ >
+ 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 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