X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=36df6b87111c323d1dc08a785dfb80af99edccfa;hb=c84cfe794ac75a4180dc551cf57c876e257a907c;hp=ff7ca6137b0ab9bed2cdc1b245a15e2a274d2751;hpb=dc1cd8cf2921db494b3b38350fe42aaf4c130628;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 ff7ca6137..36df6b871 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -127,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
@@ -148,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
@@ -266,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
@@ -280,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