X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=192a039b29f16bc6ed234aafbaad3e32f745ec6a;hb=c91ff0bda6190f7b80b7976b578c10e68f97c5b1;hp=ceafaeda9e9a783ba73133e722685a0b4498535e;hpb=2eab0bd6bdd98ef816f78b74f85ca9fe5792804c;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index ceafaeda..192a039b 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -2,22 +2,20 @@ 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"; - SigningKeyIds "55BE302B"; + SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; + SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; // 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 "; + MyEmailAddress "Debian FTP Masters "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails 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,11 +24,7 @@ Dinstall CloseBugs "true"; OverrideDisparityCheck "true"; DefaultSuite "unstable"; - LintianTags "/srv/ftp.debian.org/dak/config/debian/lintian.tags"; - QueueBuildSuites - { - unstable; - }; + LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; Reject { NoSourceOnly "true"; @@ -49,37 +43,17 @@ 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; }; }; }; -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/"; @@ -88,7 +62,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,14 +100,14 @@ Rm Suite "unstable"; }; - 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 @@ -144,13 +118,6 @@ Import-Keyring }; }; -Reject-Proposed-Updates -{ - StableRejector "the Stable Release Team"; - StableMail "debian-release@lists.debian.org"; - MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/"; -}; - Import-LDAP-Fingerprints { LDAPDn "ou=users,dc=debian,dc=org"; @@ -168,14 +135,13 @@ Clean-Suites { // How long (in seconds) dead packages are left before being killed StayOfExecution 129600; // 1.5 days - QueueBuildStayOfExecution 86400; // 24 hours MorgueSubDir "pool"; }; 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 @@ -202,73 +168,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 @@ -277,19 +176,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 @@ -300,18 +186,6 @@ 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"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - Priority "4"; VersionChecks { MustBeNewerThan @@ -330,11 +204,6 @@ Suite Stable; }; }; - UdebComponents - { - main; - non-free; - }; }; Testing @@ -345,18 +214,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 @@ -367,14 +224,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 @@ -394,14 +243,9 @@ Suite Testing; }; }; - UdebComponents - { - main; - non-free; - }; }; - Etch-m68k + Squeeze-Volatile { Components { @@ -409,17 +253,19 @@ 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 + VersionChecks { - main; - non-free; + MustBeNewerThan + { + Stable; + Testing; + }; + Enhances + { + Testing; + }; }; + }; Unstable @@ -430,13 +276,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 @@ -448,11 +287,6 @@ Suite Testing-Proposed-Updates; }; }; - UdebComponents - { - main; - non-free; - }; }; Experimental @@ -463,15 +297,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 @@ -484,38 +309,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 { @@ -523,50 +341,52 @@ 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/"; + 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/"; - QueueBuild "/srv/incoming.debian.org/buildd/"; + Override "/srv/ftp-master.debian.org/scripts/override/"; UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; + 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/"; + 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/"; @@ -585,29 +405,7 @@ DB { Name "projectb"; Host ""; - Port -1; -}; - -Architectures -{ - source "Source"; - all "Architecture Independent"; - alpha "DEC Alpha"; - hurd-i386 "Intel ia32 running the HURD"; - hppa "HP PA RISC"; - amd64 "AMD64"; - arm "ARM"; - 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"; - sparc "Sun SPARC/UltraSPARC"; - kfreebsd-i386 "GNU/kFreeBSD i386"; - kfreebsd-amd64 "GNU/kFreeBSD amd64"; + Port 5433; }; Archive @@ -641,72 +439,6 @@ Component }; }; -Section -{ - admin; - cli-mono; - comm; - database; - debian-installer; - debug; - devel; - doc; - editors; - embedded; - electronics; - fonts; - games; - gnome; - graphics; - gnu-r; - gnustep; - hamradio; - haskell; - httpd; - interpreters; - java; - kde; - kernel; - libdevel; - libs; - lisp; - localization; - mail; - math; - misc; - net; - news; - ocaml; - oldlibs; - otherosfs; - perl; - php; - python; - ruby; - science; - shells; - sound; - tex; - text; - utils; - web; - vcs; - video; - x11; - xfce; - zope; -}; - -Priority -{ - required 1; - important 2; - standard 3; - optional 4; - extra 5; - source 0; // i.e. unused -}; - OverrideType { deb; @@ -714,18 +446,6 @@ OverrideType dsc; }; -Location -{ - - // Pool locations on ftp-master.debian.org - /srv/ftp.debian.org/ftp/pool/ - { - Archive "ftp-master"; - Type "pool"; - }; - -}; - Urgency { Default "low"; @@ -742,5 +462,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"; }