X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=c798617d4068bcd21dacec097d0a9071f1bb0d30;hb=7ae8ff5952dc012ae2adeac5699ebc0f48b9b9ff;hp=2e1eb3bbd227df52224c53c1b6a1069520a4bf67;hpb=317c4c7f173540de71907f1e527437d88f48a3b9;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 2e1eb3bb..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; }; - CombinationTrees - { - popular { i386; powerpc; all; source; }; - source { source; }; - everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; }; - }; -}; - 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 @@ -126,6 +112,7 @@ Rm MyEmailAddress "Debian Archive Maintenance "; 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,72 +223,6 @@ Suite Stable; }; }; - UdebComponents - { - main; - non-free; - }; - }; - - Lenny-Volatile - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; - - }; - - Lenny-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; }; Testing @@ -337,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 @@ -359,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 @@ -386,11 +262,6 @@ Suite Testing; }; }; - UdebComponents - { - main; - non-free; - }; }; Squeeze-Volatile @@ -401,15 +272,6 @@ Suite contrib; non-free; }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Volatile Packages for Debian x.y (testing)"; - CodeName "squeeze-volatile"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; VersionChecks { MustBeNewerThan @@ -425,37 +287,6 @@ Suite }; - Squeeze-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian x.y (testing)"; - CodeName "squeeze-volatile-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - }; - Unstable { Components @@ -464,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 @@ -482,11 +306,6 @@ Suite Testing-Proposed-Updates; }; }; - UdebComponents - { - main; - non-free; - }; }; Experimental @@ -497,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 @@ -518,11 +328,6 @@ Suite Unstable; }; }; - UdebComponents - { - main; - non-free; - }; }; }; @@ -533,9 +338,7 @@ SuiteMappings "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; "map lenny stable"; - "map lenny-volatile lenny-volatile-proposed-updates"; "map squeeze testing"; - "map squeeze-volatile squeeze-volatile-proposed-updates"; "map sid unstable"; "map rc-buggy experimental"; // "map oldstable oldstable-proposed-updates"; @@ -582,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/"; @@ -596,8 +400,6 @@ Dir 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/"; - Lenny-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/lenny-volatile-p-u-new"; - Squeeze-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/squeeze-volatile-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/"; @@ -787,3 +589,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"; +}