X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=332a6170d3fc7ba5cb5f09ef5c6cc164e9a35dcb;hb=6ea92dc4c0dbfd4bc2a2250b55e5755cd2161ca4;hp=9bc64d52aadd23bec57da5a0bc556aba67fd6e34;hpb=e481e4eb4dfd397ca981df8208badc46ed01eb3f;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 9bc64d52..332a6170 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -3,6 +3,7 @@ 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"; }; SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; @@ -23,8 +24,8 @@ Dinstall BXANotify "true"; CloseBugs "true"; OverrideDisparityCheck "true"; - StableDislocationSupport "false"; DefaultSuite "unstable"; + UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; QueueBuildSuites { unstable; @@ -32,32 +33,13 @@ Dinstall Reject { NoSourceOnly "true"; + ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml"; }; }; -Binary-Upload-Restrictions +Transitions { - Components - { - //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; - }; - }; + TempPath "/srv/ftp.debian.org/tmp/"; }; Generate-Index-Diffs @@ -88,6 +70,17 @@ 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"; @@ -135,8 +128,9 @@ Import-Archive Reject-Proposed-Updates { - StableRejector "Andreas Barth and Martin Zobel-Helas"; - MoreInfoURL "http://release.debian.org/stable/4.0/4.0r1/"; + StableRejector "the Stable Release Team"; + StableMail "debian-release@lists.debian.org"; + MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/"; }; Import-LDAP-Fingerprints @@ -189,104 +183,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.1r6"; - Origin "Debian"; - Description "Debian 3.1r6 Released 7 April 2007"; - CodeName "sarge"; - OverrideCodeName "sarge"; - Priority "2"; - Untouchable "1"; - ChangeLogBase "dists/oldstable/"; - UdebComponents - { - main; - }; - }; - - Oldstable-Proposed-Updates - { - 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"; - 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.1 Proposed Updates - Not Released"; - CodeName "sarge-proposed-updates"; - OverrideCodeName "sarge"; - OverrideSuite "oldstable"; - Priority "2"; - VersionChecks - { - MustBeNewerThan - { - Oldstable; - }; - MustBeOlderThan - { - Stable; - Testing; - Unstable; - Experimental; - }; - Enhances - { - Oldstable; - }; - }; - UdebComponents - { - main; - }; - }; - Stable { Components @@ -312,14 +208,14 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "4.0r1"; + // Version "4.0r1"; Origin "Debian"; - Description "Debian 4.0r1 Released 15 August 2007"; + // Description "Debian 4.0r1 Released 15 August 2007"; CodeName "etch"; OverrideCodeName "etch"; Priority "5"; Untouchable "1"; - ChangeLogBase "dists/stable/"; + ChangeLogBase "dists/stable/"; UdebComponents { main; @@ -361,6 +257,7 @@ Suite CodeName "etch-proposed-updates"; OverrideCodeName "etch"; OverrideSuite "stable"; + ValidTime 604800; // 7 days Priority "4"; VersionChecks { @@ -400,6 +297,7 @@ Suite alpha; amd64; arm; + armel; hppa; i386; ia64; @@ -414,6 +312,7 @@ Suite Description "Debian Testing distribution - Not Released"; CodeName "lenny"; OverrideCodeName "lenny"; + ValidTime 604800; // 7 days Priority "5"; UdebComponents { @@ -437,10 +336,10 @@ Suite alpha; amd64; arm; + armel; hppa; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -450,9 +349,10 @@ Suite Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; - CodeName "testing-proposed-updates"; + CodeName "lenny-proposed-updates"; OverrideCodeName "lenny"; OverrideSuite "testing"; + ValidTime 604800; // 7 days Priority "6"; VersionChecks { @@ -506,7 +406,6 @@ Suite }; }; - Unstable { Components @@ -522,11 +421,11 @@ Suite alpha; amd64; arm; + armel; hppa; hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -538,6 +437,7 @@ Suite Description "Debian Unstable - Not Released"; CodeName "sid"; OverrideCodeName "sid"; + ValidTime 604800; // 7 days Priority "7"; VersionChecks { @@ -571,11 +471,11 @@ Suite alpha; amd64; arm; + armel; hppa; hurd-i386; i386; ia64; - m68k; mips; mipsel; powerpc; @@ -589,6 +489,7 @@ Suite NotAutomatic "yes"; OverrideCodeName "sid"; OverrideSuite "unstable"; + ValidTime 604800; // 7 days Priority "0"; VersionChecks { @@ -612,13 +513,14 @@ Suite 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 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 stable unstable"; "map-unreleased proposed-updates unstable"; @@ -628,6 +530,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/"; @@ -641,7 +573,7 @@ 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/"; @@ -657,6 +589,14 @@ Dir }; }; +Queue-Report +{ + ReportLocations + { + 822Location "/srv/ftp.debian.org/web/new.822"; + }; +}; + DB { Name "projectb";