From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 31 Jan 2009 19:46:00 +0000 (+0000)
Subject: Merge local changes on sulfur
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=0268b155eca8515611f49c029d4046b088435a82;p=deb%2Fpackages.git

Merge local changes on sulfur
---

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 9c7430c..4165bb9 100644
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -65,10 +65,11 @@
   AddEncoding x-gzip .gz
 </Directory>
 
-<VirtualHost *>
+<VirtualHost 91.189.94.219:80>
    ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
+   ServerAlias packages.ubunut.com
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
@@ -140,7 +141,7 @@
 
 </VirtualHost>
 
-<VirtualHost *>
+<VirtualHost 91.189.94.219:80>
    ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName packages.ubuntu.net
diff --git a/cron.d/110debtags b/cron.d/110debtags
index a2be695..17ee218 100755
--- a/cron.d/110debtags
+++ b/cron.d/110debtags
@@ -7,6 +7,7 @@ debtagsdir="$filesdir/debtags"
 test -d ${debtagsdir} || mkdir -p ${debtagsdir}
 cd ${debtagsdir}
 
+export http_proxy=http://squid.external:3128/
 $wget_cmd -N http://debtags.alioth.debian.org/tags/vocabulary.gz &&
 	gunzip -f vocabulary.gz