X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=26dc140b11153063e4c26919642913b14aed96e2;hb=be43b7027584f24eb1faa6275553d96f91e4e6c7;hp=7a6364bba1038c770ec5e517151057a32166784f;hpb=6f984c8f09377f51ea631e9bbfcd9ab02a39f993;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 7a6364bb..26dc140b 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,10 +1,13 @@ Dinstall { - PGPKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; - GPGKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + 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"; + }; SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "2D230C5F"; + SigningKeyIds "6070D3A1"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -15,15 +18,14 @@ Dinstall TrackingServer "packages.qa.debian.org"; LockFile "/srv/ftp.debian.org/lock/dinstall.lock"; Bcc "archive@ftp-master.debian.org"; - GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; SkipTime 300; BXANotify "true"; CloseBugs "true"; OverrideDisparityCheck "true"; - StableDislocationSupport "false"; DefaultSuite "unstable"; + UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; QueueBuildSuites { unstable; @@ -31,30 +33,13 @@ Dinstall Reject { NoSourceOnly "true"; + ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml"; }; }; -Binary-Upload-Restrictions +Transitions { - Components - { - main; - contrib; - }; - unstable - { - arm - { - 9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5; - 70BC7F9D8C60D2265B7076A23760DBCFFD6645AB; - F849E2025D1C194DE62BC6C829BE5D2268FD549F; - }; - alpha - { - 9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5; - 70BC7F9D8C60D2265B7076A23760DBCFFD6645AB; - }; - }; + TempPath "/srv/ftp.debian.org/tmp/"; }; Generate-Index-Diffs @@ -62,7 +47,7 @@ Generate-Index-Diffs Options { TempDir "/srv/ftp.debian.org/tiffani"; - MaxDiffs { Default 90; }; + MaxDiffs { Default 14; }; }; }; @@ -85,11 +70,22 @@ Mirror-Split }; }; +Show-New +{ + HTMLPath "/srv/ftp.debian.org/web/new/"; +} + +Show-Deferred +{ + LinkPath "/srv/ftp.debian.org/web/deferred/"; + DeferredQueue "/srv/queued/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"; + KnownPostgres "postgres,dak,katie,release"; }; Clean-Queues @@ -130,10 +126,19 @@ Import-Archive ExportDir "/srv/ftp.debian.org/dak/import-archive-files/"; }; +Import-Keyring +{ + /srv/ftp.debian.org/keyrings/debian-maintainers.gpg + { + Debian-Maintainer "true"; + }; +}; + Reject-Proposed-Updates { - StableRejector "Andreas Barth and Martin Zobel-Helas"; - MoreInfoURL "http://release.debian.org/stable/3.1/3.1r2/"; + StableRejector "the Stable Release Team"; + StableMail "debian-release@lists.debian.org"; + MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/"; }; Import-LDAP-Fingerprints @@ -186,7 +191,7 @@ Check-Overrides Suite { - Oldstable + OldStable { Components { @@ -199,11 +204,11 @@ Suite source; all; alpha; + amd64; arm; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -211,13 +216,79 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "3.0r6"; + // Version "4.0r1"; Origin "Debian"; - Description "Debian 3.0r6 Released 31 May 2005"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "1"; + // Description "Debian 4.0r1 Released 15 August 2007"; + CodeName "etch"; + OverrideCodeName "etch"; + Priority "5"; Untouchable "1"; + ChangeLogBase "dists/oldstable/"; + UdebComponents + { + main; + non-free; + }; + }; + + Oldstable-Proposed-Updates + { + Components + { + main; + contrib; + non-free; + }; + Architectures + { + source; + all; + alpha; + amd64; + arm; + hppa; + i386; + ia64; + mips; + mipsel; + powerpc; + s390; + sparc; + }; + 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 @@ -233,11 +304,12 @@ Suite source; all; alpha; + amd64; arm; + armel; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -245,17 +317,18 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "3.1r2"; + // Version "5.0r0"; Origin "Debian"; - Description "Debian 3.1r2 Released 17 April 2006"; - CodeName "sarge"; - OverrideCodeName "sarge"; - Priority "3"; + // Description "Debian 5.0r0 Released 14 February 2009"; + CodeName "lenny"; + OverrideCodeName "lenny"; + Priority "5"; Untouchable "1"; ChangeLogBase "dists/stable/"; UdebComponents { main; + non-free; }; }; @@ -272,11 +345,12 @@ Suite source; all; alpha; + amd64; arm; + armel; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -286,12 +360,14 @@ Suite Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/"; - Version "3.1-updates"; + CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/"; + Version "5.0-updates"; Origin "Debian"; - Description "Debian 3.1 Proposed Updates - Not Released"; - CodeName "proposed-updates"; - OverrideCodeName "sarge"; + Description "Debian 5.0 Proposed Updates - Not Released"; + CodeName "lenny-proposed-updates"; + OverrideCodeName "lenny"; OverrideSuite "stable"; + ValidTime 604800; // 7 days Priority "4"; VersionChecks { @@ -313,6 +389,7 @@ Suite UdebComponents { main; + non-free; }; }; @@ -330,11 +407,10 @@ Suite all; alpha; amd64; - arm; + armel; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -344,12 +420,14 @@ Suite Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution - Not Released"; - CodeName "etch"; - OverrideCodeName "etch"; + CodeName "squeeze"; + OverrideCodeName "squeeze"; + ValidTime 604800; // 7 days Priority "5"; UdebComponents { main; + non-free; }; }; @@ -367,11 +445,10 @@ Suite all; alpha; amd64; - arm; + armel; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -381,9 +458,10 @@ Suite Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; - CodeName "testing-proposed-updates"; - OverrideCodeName "etch"; + CodeName "squeeze-proposed-updates"; + OverrideCodeName "squeeze"; OverrideSuite "testing"; + ValidTime 604800; // 7 days Priority "6"; VersionChecks { @@ -406,6 +484,34 @@ Suite UdebComponents { main; + non-free; + }; + }; + + Etch-m68k + { + Components + { + main; + contrib; + non-free; + }; + Architectures + { + source; + all; + m68k; + }; + Announce "debian-testing-changes@lists.debian.org"; + Origin "Debian"; + Description "Debian Etch for m68k - Not Released"; + CodeName "etch-m68k"; + OverrideCodeName "etch"; + Priority "5"; + UdebComponents + { + main; + non-free; }; }; @@ -423,12 +529,11 @@ Suite all; alpha; amd64; - arm; + armel; hppa; hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -440,6 +545,7 @@ Suite Description "Debian Unstable - Not Released"; CodeName "sid"; OverrideCodeName "sid"; + ValidTime 604800; // 7 days Priority "7"; VersionChecks { @@ -454,6 +560,7 @@ Suite UdebComponents { main; + non-free; }; }; @@ -471,12 +578,11 @@ Suite all; alpha; amd64; - arm; + armel; hppa; hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -490,6 +596,7 @@ Suite NotAutomatic "yes"; OverrideCodeName "sid"; OverrideSuite "unstable"; + ValidTime 604800; // 7 days Priority "0"; VersionChecks { @@ -502,17 +609,26 @@ Suite Unstable; }; }; - + UdebComponents + { + main; + non-free; + }; }; }; SuiteMappings { + "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 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 stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; @@ -521,6 +637,36 @@ SuiteMappings "map-unreleased testing-proposed-updates unstable"; }; +AutomaticByHandPackages { + "debian-installer-images" { + 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"; + }; + + "tag-overrides" { + Source "tag-overrides"; + Section "byhand"; + Extension "tar.gz"; + Script "/srv/ftp.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"; + }; +}; + Dir { Root "/srv/ftp.debian.org/ftp/"; @@ -534,12 +680,13 @@ Dir MorgueReject "reject"; Override "/srv/ftp.debian.org/scripts/override/"; QueueBuild "/srv/incoming.debian.org/buildd/"; - UrgencyLog "/srv/ftp.debian.org/testing/urgencies/"; + UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; 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/"; @@ -549,17 +696,19 @@ Dir }; }; +Queue-Report +{ + ReportLocations + { + 822Location "/srv/ftp.debian.org/web/new.822"; + }; +}; + DB { Name "projectb"; Host ""; Port -1; - - NonUSName "projectb"; - NonUSHost "non-US.debian.org"; - NonUSPort -1; - NonUSUser "auric"; - NonUSPassword "moo"; }; Architectures