X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=c798617d4068bcd21dacec097d0a9071f1bb0d30;hb=7ae8ff5952dc012ae2adeac5699ebc0f48b9b9ff;hp=0f8e3fe269e86c1478ae7730c7b26a3f70010648;hpb=025d34b9544ed1f4924dc56fb65a6b380b0a73b5;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 0f8e3fe2..c798617d 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -64,20 +64,6 @@ Override MyEmailAddress "Debian FTP Masters "; }; -Mirror-Split -{ - FTPPath "/srv/ftp-master.debian.org/ftp"; - TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots"; - TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs"; - BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k }; - CombinationTrees - { - popular { i386; powerpc; all; source; }; - source { source; }; - everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; }; - }; -}; - Show-New { HTMLPath "/srv/ftp.debian.org/web/new/"; @@ -86,7 +72,7 @@ Show-New Show-Deferred { LinkPath "/srv/ftp.debian.org/web/deferred/"; - DeferredQueue "/srv/queued/DEFERRED/"; + DeferredQueue "/srv/upload.debian.org/DEFERRED/"; } Import-Users-From-Passwd @@ -125,7 +111,8 @@ Rm }; MyEmailAddress "Debian Archive Maintenance "; - LogFile "/srv/ftp-master.debian.org/web/removals.txt"; + LogFile "/srv/ftp.debian.org/web/removals.txt"; + LogFile822 "/srv/ftp.debian.org/web/removals.822"; Bcc "removed-packages@qa.debian.org"; }; @@ -208,19 +195,6 @@ Suite contrib; non-free; }; - Announce "debian-changes@lists.debian.org"; - // Version "5.0r0"; - Origin "Debian"; - // Description "Debian 5.0r0 Released 14 February 2009"; - CodeName "lenny"; - OverrideCodeName "lenny"; - Priority "5"; - ChangeLogBase "dists/stable/"; - UdebComponents - { - main; - non-free; - }; }; Proposed-Updates @@ -231,18 +205,6 @@ Suite contrib; non-free; }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/proposed-updates/"; - CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/"; - CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/"; - Version "5.0-updates"; - Origin "Debian"; - Description "Debian 5.0 Proposed Updates - Not Released"; - CodeName "lenny-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - Priority "4"; VersionChecks { MustBeNewerThan @@ -261,11 +223,6 @@ Suite Stable; }; }; - UdebComponents - { - main; - non-free; - }; }; Testing @@ -276,18 +233,6 @@ Suite contrib; non-free; }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Testing distribution - Not Released"; - CodeName "squeeze"; - OverrideCodeName "squeeze"; - ValidTime 604800; // 7 days - Priority "5"; - UdebComponents - { - main; - non-free; - }; }; Testing-Proposed-Updates @@ -298,14 +243,6 @@ Suite contrib; non-free; }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Testing distribution updates - Not Released"; - CodeName "squeeze-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - Priority "6"; VersionChecks { MustBeNewerThan @@ -325,11 +262,29 @@ Suite Testing; }; }; - UdebComponents + }; + + Squeeze-Volatile + { + Components { main; + contrib; non-free; }; + VersionChecks + { + MustBeNewerThan + { + Stable; + Testing; + }; + Enhances + { + Testing; + }; + }; + }; Unstable @@ -340,13 +295,6 @@ Suite contrib; non-free; }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Unstable - Not Released"; - CodeName "sid"; - OverrideCodeName "sid"; - ValidTime 604800; // 7 days - Priority "7"; VersionChecks { MustBeNewerThan @@ -358,11 +306,6 @@ Suite Testing-Proposed-Updates; }; }; - UdebComponents - { - main; - non-free; - }; }; Experimental @@ -373,15 +316,6 @@ Suite contrib; non-free; }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Experimental packages - not released; use at your own risk."; - CodeName "experimental"; - NotAutomatic "yes"; - OverrideCodeName "sid"; - OverrideSuite "unstable"; - ValidTime 604800; // 7 days - Priority "0"; VersionChecks { MustBeNewerThan @@ -394,11 +328,6 @@ Suite Unstable; }; }; - UdebComponents - { - main; - non-free; - }; }; }; @@ -456,6 +385,7 @@ Dir Templates "/srv/ftp-master.debian.org/dak/templates/"; PoolRoot "pool/"; Lists "/srv/ftp-master.debian.org/database/dists/"; + Cache "/srv/ftp-master.debian.org/database/"; Log "/srv/ftp-master.debian.org/log/"; Lock "/srv/ftp-master.debian.org/lock"; Morgue "/srv/ftp-master.debian.org/morgue/"; @@ -469,6 +399,7 @@ Dir Byhand "/srv/ftp-master.debian.org/queue/byhand/"; ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/"; + ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; Done "/srv/ftp-master.debian.org/queue/done/"; Holding "/srv/ftp-master.debian.org/queue/holding/"; New "/srv/ftp-master.debian.org/queue/new/"; @@ -509,7 +440,6 @@ Architectures armel "ARM eabi"; i386 "Intel ia32"; ia64 "Intel ia64"; - m68k "Motorola Mc680x0"; mips "MIPS (Big Endian)"; mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; @@ -653,3 +583,16 @@ Contents Header "contents"; Root "/srv/ftp-master.debian.org/test/"; } + +Common +{ + // The default number of threads for multithreading parts of dak: + ThreadCount 16; +} + +Changelogs +{ + Testing "/srv/release.debian.org/tools/trille/current-testing"; + Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog"; + Export "/srv/ftp-master.debian.org/export/changelogs"; +}