X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=36df6b87111c323d1dc08a785dfb80af99edccfa;hb=02468c9711c0cf6297d6057f9ba5ed78af11be83;hp=aee7380b1612f3386ac26c1b4c7eacd61cf99ce2;hpb=02cb714c5ba15f734c3f6d72520222677304555a;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 aee7380b1..36df6b871 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -90,7 +90,24 @@
ServerName debian.org
ServerAdmin webmaster@debian.org
- ServerAlias www.*.debian.org
+ 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
@@ -110,6 +127,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
@@ -131,8 +151,6 @@
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
@@ -249,9 +267,15 @@
>
+ 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
Use common-debian-service-ssl www.debian.org
@@ -263,11 +287,12 @@
ServerName debian.org
ServerAdmin webmaster@debian.org
- 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