X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=3581f76046eeea374c224b4bbd5ce1a4689d4a11;hb=ee794150c7fb0a800081c7c6f8cd2c005f15b3d7;hp=74cfc602644070484546d1bd1d299c40aa33d440;hpb=a4bb219d894091f5658debe0ce72d94b48db0ffa;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 74cfc602..3581f760 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -2,13 +2,13 @@ Dinstall { GPGKeyring { "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; - "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg"; + "/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 -odq -oi -t -f envelope@ftp-master.debian.org"; + SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org"; MyEmailAddress "Archive Administrator "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() @@ -16,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"; @@ -25,7 +25,7 @@ Dinstall CloseBugs "true"; OverrideDisparityCheck "true"; DefaultSuite "unstable"; - UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; + LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; QueueBuildSuites { unstable; @@ -48,14 +48,13 @@ Dinstall Transitions { Notifications "debian-devel@lists.debian.org"; - TempPath "/srv/ftp.debian.org/tmp/"; }; 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,14 +72,14 @@ 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 { ValidGID "800"; // Comma separated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,dak,katie,release"; + KnownPostgres "postgres,dak,katie,release,qa,www-data,guest"; }; Clean-Queues @@ -127,17 +112,18 @@ 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 { - /srv/ftp.debian.org/keyrings/debian-maintainers.gpg + /srv/keyring.debian.org/keyrings/debian-maintainers.gpg { Debian-Maintainer "true"; }; @@ -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 @@ -201,73 +187,6 @@ Check-Overrides Suite { - OldStable - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - // Version "4.0r1"; - Origin "Debian"; - // Description "Debian 4.0r1 Released 15 August 2007"; - CodeName "etch"; - OverrideCodeName "etch"; - Priority "5"; - ChangeLogBase "dists/oldstable/"; - UdebComponents - { - main; - non-free; - }; - }; - - Oldstable-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/oldstable-proposed-updates/"; - CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/"; - CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/"; - Version "4.0-updates"; - Origin "Debian"; - Description "Debian 4.0 Proposed Updates - Not Released"; - CodeName "etch-proposed-updates"; - OverrideCodeName "etch"; - OverrideSuite "oldstable"; - ValidTime 604800; // 7 days - Priority "4"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - }; - MustBeOlderThan - { - Stable; - Testing; - Unstable; - Experimental; - }; - Enhances - { - OldStable; - }; - }; - UdebComponents - { - main; - }; - }; - Stable { Components @@ -276,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 @@ -299,14 +208,9 @@ Suite contrib; non-free; }; - 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/"; - Version "5.0-updates"; - Origin "Debian"; - Description "Debian 5.0 Proposed Updates - Not Released"; - CodeName "lenny-proposed-updates"; + CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/"; + CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/"; OverrideCodeName "lenny"; OverrideSuite "stable"; ValidTime 604800; // 7 days @@ -329,11 +233,6 @@ Suite Stable; }; }; - UdebComponents - { - main; - non-free; - }; }; Testing @@ -344,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 @@ -366,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 @@ -393,14 +279,9 @@ Suite Testing; }; }; - UdebComponents - { - main; - non-free; - }; }; - Etch-m68k + Squeeze-Volatile { Components { @@ -408,17 +289,24 @@ Suite contrib; non-free; }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Etch for m68k - Not Released"; - CodeName "etch-m68k"; - OverrideCodeName "etch"; - Priority "5"; - UdebComponents + OverrideCodeName "squeeze"; + OverrideSuite "testing"; + ValidTime 604800; // 7 days + NotAutomatic "yes"; + Priority "0"; + VersionChecks { - main; - non-free; + MustBeNewerThan + { + Stable; + Testing; + }; + Enhances + { + Testing; + }; }; + }; Unstable @@ -429,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"; @@ -447,11 +331,6 @@ Suite Testing-Proposed-Updates; }; }; - UdebComponents - { - main; - non-free; - }; }; Experimental @@ -462,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"; @@ -483,38 +358,31 @@ Suite Unstable; }; }; - UdebComponents - { - main; - non-free; - }; }; }; SuiteMappings { - "propup-version oldstable-security stable testing testing-proposed-updates unstable"; +// "propup-version oldstable-security stable testing testing-proposed-updates unstable"; "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; - "map etch oldstable"; "map lenny stable"; "map squeeze testing"; "map sid unstable"; "map rc-buggy experimental"; - "map oldstable oldstable-proposed-updates"; - "map oldstable-security oldstable-proposed-updates"; +// "map oldstable oldstable-proposed-updates"; +// "map oldstable-security oldstable-proposed-updates"; "map stable proposed-updates"; "map stable-security proposed-updates"; "map stable-proposed-updates proposed-updates"; - "map-unreleased oldstable unstable"; +// "map-unreleased oldstable unstable"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; "map testing-security testing-proposed-updates"; "map-unreleased testing unstable"; "map-unreleased testing-proposed-updates unstable"; - "reject etch-m68k"; }; AutomaticByHandPackages { @@ -522,58 +390,56 @@ AutomaticByHandPackages { Source "debian-installer"; Section "raw-installer"; Extension "tar.gz"; - Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di"; - }; - - "debian-maintainers" { - Source "debian-maintainers"; - Section "raw-keyring"; - Extension "gpg"; - Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-dm"; + 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/"; + 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/"; 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-master.debian.org/tmp/"; Queue { - Accepted "/srv/ftp.debian.org/queue/accepted/"; - 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/"; + 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/"; }; }; @@ -589,7 +455,7 @@ DB { Name "projectb"; Host ""; - Port -1; + Port 5433; }; Architectures @@ -604,12 +470,10 @@ Architectures armel "ARM eabi"; i386 "Intel ia32"; ia64 "Intel ia64"; - m68k "Motorola Mc680x0"; mips "MIPS (Big Endian)"; mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; s390 "IBM S/390"; - sh "Hitatchi SuperH"; sparc "Sun SPARC/UltraSPARC"; kfreebsd-i386 "GNU/kFreeBSD i386"; kfreebsd-amd64 "GNU/kFreeBSD amd64"; @@ -723,7 +587,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"; @@ -747,5 +611,18 @@ 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; +} + +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"; }