The following commit has been merged in the debian-master branch:
commit 233101015535e2e723fe6455a8d91d0be54703bb
Merge: 76ea5b88fe45d0145dcb41082a7a29c0be1cf122
c47edfa85b5312d5467a4b8c3132a518e6af7ae5
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 24 18:42:23 2008 +0000
Merge branch 'debian-master' of
ssh://source.djpig.de/srv/source.djpig.de/git/packages into debian-master
diff --combined conf/apache.conf.sed.in
index ce7739f,00b38ad..bb6c21f
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -65,14 -65,15 +65,14 @@@
AddEncoding x-gzip .gz
</Directory>
-<VirtualHost *>
+<VirtualHost *:80>
ServerAdmin [EMAIL PROTECTED]
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
+ ServerAlias newpackages.debian.org
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
- CBandUser pdo
-
Alias /cgi-bin/ %TOPDIR%/cgi-bin/
PerlModule ModPerl::Registry
@@@ -81,10 -82,7 +81,7 @@@
PerlSwitches -T
<Location /cgi-bin/>
SetHandler perl-script
- # mod-perl etch
PerlInitHandler Apache2::Reload
- # mod-perl sarge
- #PerlInitHandler Apache::Reload
PerlHandler ModPerl::Registry
Options +ExecCGI
PerlSendHeader On
@@@ -117,12 -115,12 +114,12 @@@
RewriteRule ^/$ http://www.debian.org/distrib/packages
# RewriteRule ^/$ /index.html [L]
RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
- RewriteRule ^/changelog:(.+)$
http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
- RewriteRule ^/src:([^/]+)$
http://%SITE%/search?searchon=sourcenames&keywords=$1 [R,L,NE]
- RewriteRule ^/file:(.+)$
http://%SITE%/search?searchon=contents&keywords=$1 [R,L,NE]
+ RewriteRule ^/changelog:(.+)$ /changelogs/${changelog-url:$1} [R,L,NE]
+ RewriteRule ^/src:([^/]+)$
/search?searchon=sourcenames&keywords=$1 [R,L,NE]
+ RewriteRule ^/file:(.+)$ /search?searchon=contents&keywords=$1
[R,L,NE]
RewriteCond %{REQUEST_URI} !^/search$ [OR]
RewriteCond %{QUERY_STRING} ^$
- RewriteRule ^/([^/]+)$ http://%SITE%/search?keywords=$1
[R,L,NE]
+ RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
RewriteCond %{QUERY_STRING} =""
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
diff --combined config.sh.sed.in
index f948488,198effd..ffa4e10
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
# unset this if %SITE% moves somewhere where the packages files
# cannot be obtained locally
#
-localdir=/org/ftp.root/debian
+localdir=/srv/mirrors/ftp.debian.org
# path to private ftp directory
#ftproot=/org/ftp.root
@@@ -28,7 -28,6 +28,6 @@@ ftpsite=http://ftp.de.debian.org/debia
security_ftpsite=http://security.debian.org/debian-security
volatile_ftpsite=http://volatile.debian.org/debian-volatile
backports_ftpsite=http://backports.org/debian
- amd64_ftpsite=http://amd64.debian.net/debian
debports_ftpsite=http://ftp.debian-ports.org/debian
ddtp_ftpsite=
@@@ -43,14 -42,14 +42,14 @@@ search_url="/search
#
polangs="de fi fr hu ja nl ru sv uk zh-cn"
ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv
uk zh zh-cn zh-tw"
- archives="us security amd64 debports backports volatile"
+ archives="us security debports backports volatile"
sections="main contrib non-free"
parts="$sections"
suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile
etch-backports lenny sid experimental"
priorities="required important standard optional extra"
dists="$suites"
architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
- arch_sarge="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390
sparc"
+ arch_sarge="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
arch_lenny="${arch_etch} armel"
arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
