From: Paul Wise <pabs@debian.org>
Date: Mon, 19 Jun 2017 06:24:50 +0000 (+0800)
Subject: Add UTF-8 charset for all .txt files on ftp.d.o
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5bcf8431d6b375d211a29f9d2c338e4400332e1a;p=mirror%2Fdsa-puppet.git

Add UTF-8 charset for all .txt files on ftp.d.o

The dedication text files are UTF-8 encoded and
various browsers do not do automatic charset detection.

Suggested-by: KiBi on IRC (IIRC)
---

diff --git a/modules/roles/templates/apache-ftp.debian.org.erb b/modules/roles/templates/apache-ftp.debian.org.erb
index 6dda3727a..534c8b142 100644
--- a/modules/roles/templates/apache-ftp.debian.org.erb
+++ b/modules/roles/templates/apache-ftp.debian.org.erb
@@ -13,6 +13,8 @@
 	ServerAlias debian.backend.mirrors.debian.org
 	ServerAlias *.debian.backend.mirrors.debian.org
 
+	AddCharset UTF-8 .txt
+
 	RedirectMatch "^/$" /debian/
 	Alias /debian/ <%= @archive_root %>/