X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=98da875cf185f2af03a8bda2bd9f1a52cbd44194;hb=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=7c76d0ca60c2a07f12156a23790a678cfb0b7b9d;hpb=04124dca8d87afbcde068a654462b62978a415e9;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 7c76d0ca..98da875c 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -2,11 +2,10 @@ Dinstall { GPGKeyring { "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"; }; - SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; - SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; + SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; SigningKeyIds "55BE302B"; // SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org"; SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org"; @@ -17,7 +16,7 @@ Dinstall BugServer "bugs.debian.org"; PackagesServer "packages.debian.org"; TrackingServer "packages.qa.debian.org"; - LockFile "/srv/ftp.debian.org/lock/dinstall.lock"; + LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock"; Bcc "archive@ftp-master.debian.org"; FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; @@ -26,7 +25,7 @@ Dinstall CloseBugs "true"; OverrideDisparityCheck "true"; DefaultSuite "unstable"; - LintianTags "/srv/ftp.debian.org/dak/config/debian/lintian.tags"; + LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; QueueBuildSuites { unstable; @@ -55,7 +54,7 @@ Generate-Index-Diffs { Options { - TempDir "/srv/ftp.debian.org/tiffani"; + TempDir "/srv/ftp-master.debian.org/tiffani"; MaxDiffs { Default 14; }; }; }; @@ -65,20 +64,6 @@ Override MyEmailAddress "Debian FTP Masters "; }; -Mirror-Split -{ - FTPPath "/srv/ftp.debian.org/ftp"; - TreeRootPath "/srv/ftp.debian.org/scratch/dsilvers/treeroots"; - TreeDatabasePath "/srv/ftp.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/"; @@ -87,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 @@ -127,12 +112,13 @@ 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"; }; Import-Archive { - ExportDir "/srv/ftp.debian.org/dak/import-archive-files/"; + ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/"; }; Import-Keyring @@ -173,8 +159,8 @@ Clean-Suites Process-New { - DinstallLockFile "/srv/ftp.debian.org/lock/processnew.lock"; - LockDir "/srv/ftp.debian.org/lock/new/"; + DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock"; + LockDir "/srv/ftp-master.debian.org/lock/new/"; }; Check-Overrides @@ -234,8 +220,8 @@ Suite }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; - CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/"; - CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/"; + 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"; @@ -269,6 +255,67 @@ Suite }; }; + 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 { Components @@ -333,6 +380,69 @@ Suite }; }; + Squeeze-Volatile + { + Components + { + main; + 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 + { + Stable; + Testing; + }; + Enhances + { + Testing; + }; + }; + + }; + + 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 @@ -410,7 +520,9 @@ 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"; @@ -432,51 +544,54 @@ AutomaticByHandPackages { Source "debian-installer"; Section "raw-installer"; Extension "tar.gz"; - Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-di"; }; "tag-overrides" { Source "tag-overrides"; Section "byhand"; Extension "tar.gz"; - Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-tag"; }; "task-overrides" { Source "tasksel"; Section "byhand"; Extension "tar.gz"; - Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-task"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task"; }; }; Dir { - Root "/srv/ftp.debian.org/ftp/"; - Pool "/srv/ftp.debian.org/ftp/pool/"; - Templates "/srv/ftp.debian.org/dak/templates/"; + Root "/srv/ftp-master.debian.org/ftp/"; + Pool "/srv/ftp-master.debian.org/ftp/pool/"; + Templates "/srv/ftp-master.debian.org/dak/templates/"; PoolRoot "pool/"; - Lists "/srv/ftp.debian.org/database/dists/"; - Log "/srv/ftp.debian.org/log/"; - Lock "/srv/ftp.debian.org/lock"; - Morgue "/srv/ftp.debian.org/morgue/"; + Lists "/srv/ftp-master.debian.org/database/dists/"; + Log "/srv/ftp-master.debian.org/log/"; + Lock "/srv/ftp-master.debian.org/lock"; + Morgue "/srv/ftp-master.debian.org/morgue/"; MorgueReject "reject"; - Override "/srv/ftp.debian.org/scripts/override/"; + Override "/srv/ftp-master.debian.org/scripts/override/"; QueueBuild "/srv/incoming.debian.org/buildd/"; UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; - TempPath "/srv/ftp.debian.org/tmp/"; + TempPath "/srv/ftp-master.debian.org/tmp/"; Queue { - Byhand "/srv/ftp.debian.org/queue/byhand/"; - ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/"; - OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/"; - Done "/srv/ftp.debian.org/queue/done/"; - Holding "/srv/ftp.debian.org/queue/holding/"; - New "/srv/ftp.debian.org/queue/new/"; - Reject "/srv/ftp.debian.org/queue/reject/"; - Unchecked "/srv/ftp.debian.org/queue/unchecked/"; - Newstage "/srv/ftp.debian.org/queue/newstage/"; - BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/"; + 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/"; + 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/"; + Reject "/srv/ftp-master.debian.org/queue/reject/"; + Unchecked "/srv/ftp-master.debian.org/queue/unchecked/"; + Newstage "/srv/ftp-master.debian.org/queue/newstage/"; + BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/"; Embargoed "/does/not/exist/"; Unembargoed "/does/not/exist/"; Disembargo "/does/not/exist/"; @@ -495,7 +610,7 @@ DB { Name "projectb"; Host ""; - Port -1; + Port 5433; }; Architectures @@ -510,7 +625,6 @@ Architectures armel "ARM eabi"; i386 "Intel ia32"; ia64 "Intel ia64"; - m68k "Motorola Mc680x0"; mips "MIPS (Big Endian)"; mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; @@ -628,7 +742,7 @@ Location { // Pool locations on ftp-master.debian.org - /srv/ftp.debian.org/ftp/pool/ + /srv/ftp-master.debian.org/ftp/pool/ { Archive "ftp-master"; Type "pool"; @@ -652,5 +766,11 @@ Urgency Contents { Header "contents"; - Root "/srv/ftp.debian.org/test/"; + Root "/srv/ftp-master.debian.org/test/"; +} + +Common +{ + // The default number of threads for multithreading parts of dak: + ThreadCount 16; }