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=c84cfe794ac75a4180dc551cf57c876e257a907c;hp=7a2863b5a98411d289423da87f6ae5148c8b1eef;hpb=8a050c1f2563376a05350bc6221b5098ff515201;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 7a2863b5a..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
@@ -284,7 +287,7 @@
    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/