X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=0f77a7f49e61b9286f13890a8932d36d8bda4318;hb=125987c8dc985671e5f6cd24bffae35e9acf5aea;hp=0af66820a997927b856dac7637840ae81767c08e;hpb=6c92853af8a7ca65fad19cb0f1a0ffaecec48fb7;p=dak.git diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 0af66820..0f77a7f4 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -1,12 +1,11 @@ Dinstall { GPGKeyring { - "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/org/keyring.debian.org/keyrings/debian-keyring.pgp"; + "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; }; SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "2D230C5F"; + SigningKeyIds "55BE302B"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -16,6 +15,7 @@ Dinstall PackagesServer "packages.debian.org"; LockFile "/org/security.debian.org/dak/lock"; Bcc "archive@ftp-master.debian.org"; + // GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; SkipTime 300; @@ -30,16 +30,16 @@ Dinstall }; SecurityQueueHandling "true"; SecurityQueueBuild "true"; - DefaultSuite "Testing"; + DefaultSuite "stable"; SuiteSuffix "updates"; OverrideMaintainer "dak@security.debian.org"; - StableDislocationSupport "false"; LegacyStableHasNoSections "false"; }; -Process-Unchecked +Process-New { AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock"; + LockDir "/srv/security-master.debian.org/lock/new/"; }; Import-Users-From-Passwd @@ -53,9 +53,9 @@ Queue-Report { Directories { - byhand; - new; - accepted; + // byhand; + // new; + unembargoed; }; }; @@ -111,7 +111,7 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by 'dak make-maintainers' (highest wins). - Oldstable + OldStable { Components { @@ -119,29 +119,14 @@ Suite updates/contrib; updates/non-free; }; - Architectures - { - source; - all; - alpha; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "dak@security.debian.org"; - Version "3.0"; + Version ""; Origin "Debian"; Label "Debian-Security"; - Description "Debian 3.0 Security Updates"; - CodeName "woody"; - OverrideCodeName "woody"; + Description "Debian 4.0 Security Updates"; + ValidTime 864000; // 10 days + CodeName "etch"; + OverrideCodeName "etch"; CopyDotDak "/org/security.debian.org/queue/done/"; }; @@ -153,77 +138,45 @@ Suite updates/contrib; updates/non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "dak@security.debian.org"; - Version "3.1"; + Version ""; Origin "Debian"; Label "Debian-Security"; - Description "Debian 3.1 Security Updates"; - CodeName "sarge"; - OverrideCodeName "sarge"; + Description "Debian 5.0 Security Updates"; + ValidTime 864000; // 10 days + CodeName "lenny"; + OverrideCodeName "lenny"; CopyDotDak "/org/security.debian.org/queue/done/"; }; Testing { - Components + Components { updates/main; updates/contrib; updates/non-free; }; - Architectures - { - source; - all; - amd64; - alpha; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "dak@security.debian.org"; Version ""; Origin "Debian"; Label "Debian-Security"; Description "Debian testing Security Updates"; - CodeName "etch"; - OverrideCodeName "etch"; + ValidTime 864000; // 10 days + CodeName "squeeze"; + OverrideCodeName "squeeze"; CopyDotDak "/org/security.debian.org/queue/done/"; }; - }; SuiteMappings { - "silent-map oldstable-security oldstable"; "silent-map stable-security stable"; + "silent-map oldstable-security oldstable"; // JT - FIXME, hackorama // "silent-map testing-security stable"; - "silent-map etch-secure testing"; + "silent-map etch-secure oldstable"; + "silent-map lenny-secure stable"; "silent-map testing-security testing"; }; @@ -242,6 +195,7 @@ Dir MorgueReject "reject"; Override "/org/security.debian.org/scripts/override/"; QueueBuild "/org/security.debian.org/buildd/"; + Upload "/srv/queued/UploadQueue/"; Queue { Accepted "/org/security.debian.org/queue/accepted/"; @@ -251,6 +205,8 @@ Dir New "/org/security.debian.org/queue/new/"; Reject "/org/security.debian.org/queue/reject/"; Unchecked "/org/security.debian.org/queue/unchecked/"; + ProposedUpdates "/does/not/exist/"; // XXX fixme + OldProposedUpdates "/does/not/exist/"; // XXX fixme Embargoed "/org/security.debian.org/queue/embargoed/"; Unembargoed "/org/security.debian.org/queue/unembargoed/"; @@ -274,9 +230,9 @@ Architectures alpha "DEC Alpha"; hppa "HP PA RISC"; arm "ARM"; + armel "ARM EABI"; i386 "Intel ia32"; ia64 "Intel ia64"; - m68k "Motorola Mc680x0"; mips "MIPS (Big Endian)"; mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; @@ -334,31 +290,45 @@ ComponentMappings Section { admin; - base; + cli-mono; comm; + database; debian-installer; + debug; devel; doc; editors; - electronics; 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; @@ -366,8 +336,11 @@ Section text; utils; web; + vcs; + video; x11; - non-US; + xfce; + zope; }; Priority @@ -389,18 +362,12 @@ OverrideType Location { - /org/security.debian.org/ftp/dists/ - { - Archive "security"; - Type "legacy"; - }; - /org/security.debian.org/ftp/pool/ { Archive "security"; Suites { - Oldstable; + OldStable; Stable; Testing; };