X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=aee7380b1612f3386ac26c1b4c7eacd61cf99ce2;hb=729e6d78e4d1171c0bf9523e314376510446f56b;hp=96e71a138dd2c8cfb948e21f00578ceef7434c17;hpb=c4e401c9464862b4987da1f2fd0e7d5d870cda0b;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 96e71a138..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 debian.us www.debian.us debian.gr www.debian.gr
+
+ 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
@@ -219,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