The following commit has been merged in the ubuntu-master branch:
commit 0268b155eca8515611f49c029d4046b088435a82
Author: Frank Lichtenheld <[email protected]>
Date: Sat Jan 31 19:46:00 2009 +0000
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 [email protected]
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 [email protected]
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
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
