X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=3581f76046eeea374c224b4bbd5ce1a4689d4a11;hb=ee794150c7fb0a800081c7c6f8cd2c005f15b3d7;hp=2eaccd7641b512c870650902e4e72942baef0e08;hpb=dc1606c545145946238aec86045b38b3b14a722f;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 2eaccd76..3581f760 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,9 @@ 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,14 +208,9 @@ 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 @@ -261,11 +233,6 @@ Suite Stable; }; }; - UdebComponents - { - main; - non-free; - }; }; Testing @@ -276,18 +243,9 @@ 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,10 +256,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 @@ -325,11 +279,34 @@ Suite Testing; }; }; - UdebComponents + }; + + Squeeze-Volatile + { + Components { main; + contrib; non-free; }; + OverrideCodeName "squeeze"; + OverrideSuite "testing"; + ValidTime 604800; // 7 days + NotAutomatic "yes"; + Priority "0"; + VersionChecks + { + MustBeNewerThan + { + Stable; + Testing; + }; + Enhances + { + Testing; + }; + }; + }; Unstable @@ -340,10 +317,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"; @@ -358,11 +331,6 @@ Suite Testing-Proposed-Updates; }; }; - UdebComponents - { - main; - non-free; - }; }; Experimental @@ -373,10 +341,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"; @@ -394,11 +358,6 @@ Suite Unstable; }; }; - UdebComponents - { - main; - non-free; - }; }; }; @@ -456,6 +415,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 +429,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/"; @@ -494,7 +455,7 @@ DB { Name "projectb"; Host ""; - Port -1; + Port 5433; }; Architectures @@ -509,7 +470,6 @@ Architectures armel "ARM eabi"; i386 "Intel ia32"; ia64 "Intel ia64"; - m68k "Motorola Mc680x0"; mips "MIPS (Big Endian)"; mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; @@ -659,3 +619,10 @@ 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"; +}