X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fvars;h=0d5eb5299acc040dc3ead0066659eec17086b4c2;hb=6fc4364a09bb5a1a1b04de47b33b1c7cb4fdaa04;hp=352a8fc4503b5f4849d0e2fd5c6f1881bd4d7c0c;hpb=c86d96790c95deed79c5ac3727361ac798c39f0f;p=dak.git diff --git a/config/debian/vars b/config/debian/vars index 352a8fc4..0d5eb529 100644 --- a/config/debian/vars +++ b/config/debian/vars @@ -1,11 +1,12 @@ # locations used by many scripts -base=/srv/ftp.debian.org +base=/srv/ftp-master.debian.org +public=/srv/ftp.debian.org bindir=$base/bin ftpdir=$base/ftp -webdir=$base/web +webdir=$public/web indices=$ftpdir/indices -archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc" +archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 " scriptdir=$base/scripts masterdir=$base/dak/ @@ -23,6 +24,9 @@ unchecked=$queuedir/unchecked/ accepted=$queuedir/accepted/ mirrordir=$base/mirror/ incoming=$base/incoming +newstage=$queuedir/newstage/ +exportdir=$base/export/ +exportpublic=$public/rsync/export/ ftpgroup=debadmin @@ -31,3 +35,5 @@ copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-fr PATH=$masterdir:$PATH umask 022 +# Set the database variables +eval $(dak admin config db-shell)