[Piuparts-commits] [piuparts] 03/06: use 'AddDefaultCharset utf-8' to mark the logfiles as UTF-8

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 0ce16d4fe26443b39d093dfb70c0d240ba241e00
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Nov 17 00:18:37 2014 +0100

    use 'AddDefaultCharset utf-8' to mark the logfiles as UTF-8
    
    to display maintainer names correctly
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 README_pejacevic.txt      | 3 ++-
 conf/piuparts-master.conf | 4 +---
 debian/changelog          | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README_pejacevic.txt b/README_pejacevic.txt
index a49b09b..23b8da4 100644
--- a/README_pejacevic.txt
+++ b/README_pejacevic.txt
@@ -92,7 +92,8 @@ Any other webserver will do but apache is used on pejacevic (and maintained by D
 	CustomLog /var/log/apache2/piuparts.debian.org-access.log combined
 
 	DocumentRoot /srv/piuparts.debian.org/htdocs
-	AddType text/plain log
+	AddType text/plain .log
+	AddDefaultCharset utf-8
 
 	HostnameLookups Off
 	UseCanonicalName Off
diff --git a/conf/piuparts-master.conf b/conf/piuparts-master.conf
index 9aca2ad..bc4ca40 100644
--- a/conf/piuparts-master.conf
+++ b/conf/piuparts-master.conf
@@ -6,7 +6,5 @@ Alias /piuparts /var/lib/piuparts/htdocs
   Options indexes
 
   AddType text/plain .log
+  AddDefaultCharset utf-8
 </Directory>
-
-
-
diff --git a/debian/changelog b/debian/changelog
index 67ccaf5..f94d7de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * piuparts.py:
     - Add to ignored_files:
       + /etc/modules-load.d/modules.conf  (dangling symlink to ../modules)
+  * Add "AddDefaultCharset utf-8" to the apache2 configuration snipplet
+    example, so that logfiles are displayed as UTF-8.
   * pre_install_foreign_architecture: New script to enable foreign
     architectures for testing cross toolchain packages.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git