X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=c5a87ca1c885bd800ad3e79f13a314505a0aa709;hb=8ecb9ff76c84bb82f9289b03ce79aaa939ea2d82;hp=047cf2691eef78647566b4f877b61efcbc6e6a85;hpb=a9f99c6edebf128ac96e1da544cfa99892bda72c;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 047cf269..c5a87ca1 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"; @@ -23,6 +26,7 @@ Dinstall OverrideDisparityCheck "true"; StableDislocationSupport "false"; DefaultSuite "unstable"; + UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; QueueBuildSuites { unstable; @@ -30,15 +34,48 @@ Dinstall Reject { NoSourceOnly "true"; + ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml"; }; }; +Transitions +{ + TempPath "/srv/ftp.debian.org/tmp/"; +}; + 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 + { + arm + { + 9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5; + 70BC7F9D8C60D2265B7076A23760DBCFFD6645AB; + F849E2025D1C194DE62BC6C829BE5D2268FD549F; + }; + alpha + { + 9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5; + 70BC7F9D8C60D2265B7076A23760DBCFFD6645AB; + }; + }; +}; + +Binary-Upload-Restrictions +{ + Components + { + //main; + //contrib; + // Yay for consensus through GRs voted on by people not actually involved in the affected architectures + none; }; unstable { @@ -84,11 +121,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 @@ -131,8 +179,9 @@ Import-Archive Reject-Proposed-Updates { - StableRejector "Andreas Barth and Martin Zobel-Helas"; - MoreInfoURL "http://release.debian.org/stable/3.1/3.1r5/"; + StableRejector "the Stable Release Team"; + StableMail "debian-release@lists.debian.org"; + MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/"; }; Import-LDAP-Fingerprints @@ -185,40 +234,6 @@ Check-Overrides Suite { - Oldstable - { - Components - { - main; - contrib; - non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; - Announce "debian-changes@lists.debian.org"; - Version "3.0r6"; - Origin "Debian"; - Description "Debian 3.0r6 Released 31 May 2005"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "1"; - Untouchable "1"; - }; - Stable { Components @@ -232,11 +247,11 @@ Suite source; all; alpha; + amd64; arm; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -244,17 +259,18 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "3.1r5"; + // Version "4.0r1"; Origin "Debian"; - Description "Debian 3.1r5 Released 17 February 2007"; - CodeName "sarge"; - OverrideCodeName "sarge"; - Priority "3"; + // Description "Debian 4.0r1 Released 15 August 2007"; + CodeName "etch"; + OverrideCodeName "etch"; + Priority "5"; Untouchable "1"; ChangeLogBase "dists/stable/"; UdebComponents { main; + non-free; }; }; @@ -271,11 +287,11 @@ Suite source; all; alpha; + amd64; arm; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -285,12 +301,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 "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"; + ValidTime 604800; // 7 days Priority "4"; VersionChecks { @@ -330,10 +348,10 @@ Suite alpha; amd64; arm; + armel; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -343,8 +361,9 @@ Suite Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution - Not Released"; - CodeName "etch"; - OverrideCodeName "etch"; + CodeName "lenny"; + OverrideCodeName "lenny"; + ValidTime 604800; // 7 days Priority "5"; UdebComponents { @@ -368,10 +387,10 @@ Suite alpha; amd64; arm; + armel; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -382,8 +401,9 @@ Suite Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; CodeName "testing-proposed-updates"; - OverrideCodeName "etch"; + OverrideCodeName "lenny"; OverrideSuite "testing"; + ValidTime 604800; // 7 days Priority "6"; VersionChecks { @@ -410,6 +430,33 @@ 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 @@ -425,11 +472,11 @@ Suite alpha; amd64; arm; + armel; hppa; hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -441,6 +488,7 @@ Suite Description "Debian Unstable - Not Released"; CodeName "sid"; OverrideCodeName "sid"; + ValidTime 604800; // 7 days Priority "7"; VersionChecks { @@ -474,11 +522,11 @@ Suite alpha; amd64; arm; + armel; hppa; hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -492,6 +540,7 @@ Suite NotAutomatic "yes"; OverrideCodeName "sid"; OverrideSuite "unstable"; + ValidTime 604800; // 7 days Priority "0"; VersionChecks { @@ -515,10 +564,15 @@ 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 stable-proposed-updates proposed-updates"; + "map-unreleased oldstable unstable"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; @@ -527,6 +581,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/"; @@ -540,12 +624,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/"; @@ -560,12 +645,6 @@ DB Name "projectb"; Host ""; Port -1; - - NonUSName "projectb"; - NonUSHost "non-US.debian.org"; - NonUSPort -1; - NonUSUser "auric"; - NonUSPassword "moo"; }; Architectures