From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 29 Apr 2013 19:34:34 +0000 (+0200)
Subject: update with what we have on franck
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3be94b18d793adf94951757981926f2e7e77cfa7;p=dak.git

update with what we have on franck
---

diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index 52a85528..a326bb27 100644
--- a/config/debian/apache.conf-ftp
+++ b/config/debian/apache.conf-ftp
@@ -18,5 +18,9 @@
     Options MultiViews Indexes SymLinksIfOwnerMatch
   </Directory>
 
+  <Directory /srv/ftp.debian.org/web>
+    AddCharset utf-8 .txt
+  </Directory>
+
   RewriteEngine On
   RewriteRule ^/~(.+) /users/$1 [R=permanent,L]
diff --git a/config/homedir/.bashrc b/config/homedir/.bashrc
index 2a4fd452..881e7303 100644
--- a/config/homedir/.bashrc
+++ b/config/homedir/.bashrc
@@ -54,6 +54,7 @@ export EDITOR=$(which vim)
 export HISTFILESIZE=6000
 export GREP_OPTIONS="--color=auto"
 export CDPATH=".:~:${base}:${public}:${queuedir}"
+export PATH="~/bin/:${PATH}"
 
 alias base='cd ${base}'
 alias config='cd ${configdir}'