X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=6a989215edf8721a2a8dabb819ec604c1fde850e;hb=b6d163b9acb6a7c5ff29c741ebf12a2e9171d3b0;hp=60247d3d003c0c912851d6e4a4cf3a4f4f0693f7;hpb=744bff0ed8edc4126b62ee82e60823d30a65c293;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 60247d3d..6a989215 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,7 +1,10 @@ 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 "6070D3A1"; @@ -15,7 +18,6 @@ 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; @@ -24,6 +26,7 @@ Dinstall OverrideDisparityCheck "true"; StableDislocationSupport "false"; DefaultSuite "unstable"; + UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; QueueBuildSuites { unstable; @@ -38,8 +41,10 @@ Binary-Upload-Restrictions { Components { - main; - contrib; + //main; + //contrib; + // Yay for consensus through GRs voted on by people not actually involved in the affected architectures + none; }; unstable { @@ -62,7 +67,7 @@ Generate-Index-Diffs Options { TempDir "/srv/ftp.debian.org/tiffani"; - MaxDiffs { Default 90; }; + MaxDiffs { Default 14; }; }; }; @@ -85,11 +90,16 @@ Mirror-Split }; }; +Show-New +{ + HTMLPath "/srv/ftp.debian.org/web/new/"; +} + 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 @@ -133,7 +143,7 @@ Import-Archive Reject-Proposed-Updates { StableRejector "Andreas Barth and Martin Zobel-Helas"; - MoreInfoURL "http://release.debian.org/stable/3.1/3.1r4/"; + MoreInfoURL "http://release.debian.org/stable/4.0/4.0r3/"; }; Import-LDAP-Fingerprints @@ -211,16 +221,21 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "3.0r6"; + Version "3.1r6"; Origin "Debian"; - Description "Debian 3.0r6 Released 31 May 2005"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "1"; + Description "Debian 3.1r6 Released 7 April 2007"; + CodeName "sarge"; + OverrideCodeName "sarge"; + Priority "2"; Untouchable "1"; + ChangeLogBase "dists/oldstable/"; + UdebComponents + { + main; + }; }; - Stable + Oldstable-Proposed-Updates { Components { @@ -245,17 +260,77 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "3.1r4"; + 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 "3.1-updates"; Origin "Debian"; - Description "Debian 3.1r4 Released 28 October 2006"; - CodeName "sarge"; + Description "Debian 3.1 Proposed Updates - Not Released"; + CodeName "sarge-proposed-updates"; OverrideCodeName "sarge"; - Priority "3"; + OverrideSuite "oldstable"; + Priority "2"; + VersionChecks + { + MustBeNewerThan + { + Oldstable; + }; + MustBeOlderThan + { + Stable; + Testing; + Unstable; + Experimental; + }; + Enhances + { + Oldstable; + }; + }; + UdebComponents + { + main; + }; + }; + + Stable + { + 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"; + // Version "4.0r1"; + Origin "Debian"; + // Description "Debian 4.0r1 Released 15 August 2007"; + CodeName "etch"; + OverrideCodeName "etch"; + Priority "5"; Untouchable "1"; - ChangeLogBase "dists/stable/"; + ChangeLogBase "dists/stable/"; UdebComponents { main; + non-free; }; }; @@ -272,11 +347,11 @@ Suite source; all; alpha; + amd64; arm; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -286,11 +361,12 @@ 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 "4.0-updates"; Origin "Debian"; - Description "Debian 3.1 Proposed Updates - Not Released"; - CodeName "proposed-updates"; - OverrideCodeName "sarge"; + Description "Debian 4.0 Proposed Updates - Not Released"; + CodeName "etch-proposed-updates"; + OverrideCodeName "etch"; OverrideSuite "stable"; Priority "4"; VersionChecks @@ -334,7 +410,6 @@ Suite hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -344,8 +419,8 @@ Suite Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution - Not Released"; - CodeName "etch"; - OverrideCodeName "etch"; + CodeName "lenny"; + OverrideCodeName "lenny"; Priority "5"; UdebComponents { @@ -383,7 +458,7 @@ Suite Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; CodeName "testing-proposed-updates"; - OverrideCodeName "etch"; + OverrideCodeName "lenny"; OverrideSuite "testing"; Priority "6"; VersionChecks @@ -411,6 +486,34 @@ Suite }; }; + 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; + }; + }; + + Unstable { Components @@ -426,6 +529,7 @@ Suite alpha; amd64; arm; + armel; hppa; hurd-i386; i386; @@ -475,6 +579,7 @@ Suite alpha; amd64; arm; + armel; hppa; hurd-i386; i386; @@ -516,10 +621,14 @@ Suite 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-unreleased oldstable unstable"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; @@ -528,6 +637,29 @@ SuiteMappings "map-unreleased testing-proposed-updates unstable"; }; +AutomaticByHandPackages { + "debian-installer-images" { + Source "xxx-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"; + }; +}; + Dir { Root "/srv/ftp.debian.org/ftp/"; @@ -547,6 +679,7 @@ Dir 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/"; @@ -561,12 +694,6 @@ DB Name "projectb"; Host ""; Port -1; - - NonUSName "projectb"; - NonUSHost "non-US.debian.org"; - NonUSPort -1; - NonUSUser "auric"; - NonUSPassword "moo"; }; Architectures