X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=dc70f6821dbf23cfd9b3568081adbb68a42414d6;hb=4f9723c15d716aa56cf76408d714b7bb73e3aa63;hp=b146c637badedc8fdb914e608d353b8eae2796f1;hpb=141673ae65e8160c78464c1eac1ecb615aedfc54;p=dak.git diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index b146c637..dc70f682 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -1,10 +1,12 @@ Dinstall { - PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp"; - GPGKeyring "/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"; + GPGKeyring { + "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + }; + // was non-us.d.o path before + SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; + SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + SigningKeyIds "55BE302B"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -12,8 +14,9 @@ Dinstall MyDistribution "Debian"; // Used in emails BugServer "bugs.debian.org"; PackagesServer "packages.debian.org"; - LockFile "/org/security.debian.org/dak/lock"; + LockFile "/org/security-master.debian.org/dak/lock"; Bcc "archive@ftp-master.debian.org"; + // GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; SkipTime 300; @@ -22,22 +25,20 @@ Dinstall BXANotify "false"; QueueBuildSuites { - oldstable; stable; testing; }; 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"; + AcceptedLockFile "/srv/security-master.debian.org/lock/unchecked.lock"; }; Import-Users-From-Passwd @@ -51,12 +52,33 @@ Queue-Report { Directories { - byhand; - new; - accepted; + // byhand; + // new; + unembargoed; }; }; +Import-Keyring +{ + /srv/keyring.debian.org/keyrings/debian-maintainers.gpg + { + Debian-Maintainer "true"; + }; +}; + +Import-LDAP-Fingerprints +{ + LDAPDn "ou=users,dc=debian,dc=org"; + LDAPServer "db.debian.org"; + ExtraKeyrings + { + "/srv/keyring.debian.org/keyrings/removed-keys.pgp"; + "/srv/keyring.debian.org/keyrings/removed-keys.gpg"; + "/srv/keyring.debian.org/keyrings/extra-keys.pgp"; + }; + KeyServer "wwwkeys.eu.pgp.net"; +}; + Clean-Queues { Options @@ -74,12 +96,12 @@ Rm }; MyEmailAddress "Debian Archive Maintenance "; - LogFile "/org/security.debian.org/dak-log/removals.txt"; + LogFile "/srv/security-master.debian.org/dak-log/removals.txt"; }; Init-Archive { - ExportDir "/org/security.debian.org/dak/import-archive-files/"; + ExportDir "/srv/security-master.debian.org/dak/import-archive-files/"; }; Clean-Suites @@ -109,40 +131,6 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by 'dak make-maintainers' (highest wins). - Oldstable - { - Components - { - updates/main; - 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"; - Origin "Debian"; - Label "Debian-Security"; - Description "Debian 3.0 Security Updates"; - CodeName "woody"; - OverrideCodeName "woody"; - CopyDotDak "/org/security.debian.org/queue/done/"; - }; - Stable { Components @@ -151,108 +139,81 @@ 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"; - CopyDotDak "/org/security.debian.org/queue/done/"; + Description "Debian 5.0 Security Updates"; + ValidTime 864000; // 10 days + CodeName "lenny"; + OverrideCodeName "lenny"; + CopyDotDak "/srv/security-master.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"; - CopyDotDak "/org/security.debian.org/queue/done/"; + ValidTime 864000; // 10 days + CodeName "squeeze"; + OverrideCodeName "squeeze"; + CopyDotDak "/srv/security-master.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"; }; Dir { - Root "/org/security.debian.org/ftp/"; - Pool "/org/security.debian.org/ftp/pool/"; - Dak "/org/security.debian.org/dak/"; - Templates "/org/security.debian.org/dak/templates/"; + Root "/srv/security-master.debian.org/ftp/"; + Pool "/srv/security-master.debian.org/ftp/pool/"; + Dak "/srv/security-master.debian.org/dak/"; + Templates "/srv/security-master.debian.org/dak/templates/"; PoolRoot "pool/"; - Override "/org/security.debian.org/override/"; - Lock "/org/security.debian.org/lock/"; - Lists "/org/security.debian.org/dak-database/dists/"; - Log "/org/security.debian.org/dak-log/"; - Morgue "/org/security.debian.org/morgue/"; + Override "/srv/security-master.debian.org/override/"; + Lock "/srv/security-master.debian.org/lock/"; + Cache "/srv/security-master.debian.org/database/"; + Lists "/srv/security-master.debian.org/dak-database/dists/"; + Log "/srv/security-master.debian.org/dak-log/"; + Morgue "/srv/security-master.debian.org/morgue/"; MorgueReject "reject"; - Override "/org/security.debian.org/scripts/override/"; - QueueBuild "/org/security.debian.org/buildd/"; + Override "/srv/security-master.debian.org/scripts/override/"; + QueueBuild "/srv/security-master.debian.org/buildd/"; + Upload "/srv/queued/ftpmaster/"; Queue { - Accepted "/org/security.debian.org/queue/accepted/"; - Byhand "/org/security.debian.org/queue/byhand/"; - Done "/org/security.debian.org/queue/done/"; - Holding "/org/security.debian.org/queue/holding/"; - New "/org/security.debian.org/queue/new/"; - Reject "/org/security.debian.org/queue/reject/"; - Unchecked "/org/security.debian.org/queue/unchecked/"; - - Embargoed "/org/security.debian.org/queue/embargoed/"; - Unembargoed "/org/security.debian.org/queue/unembargoed/"; - Disembargo "/org/security.debian.org/queue/unchecked-disembargo/"; + Byhand "/srv/security-master.debian.org/queue/byhand/"; + Done "/srv/security-master.debian.org/queue/done/"; + Holding "/srv/security-master.debian.org/queue/holding/"; + New "/srv/security-master.debian.org/queue/new/"; + Reject "/srv/security-master.debian.org/queue/reject/"; + Unchecked "/srv/security-master.debian.org/queue/unchecked/"; + Newstage "/srv/security-master.debian.org/queue/newstage/"; + + ProposedUpdates "/does/not/exist/"; // XXX fixme + OldProposedUpdates "/does/not/exist/"; // XXX fixme + + Embargoed "/srv/security-master.debian.org/queue/embargoed/"; + Unembargoed "/srv/security-master.debian.org/queue/unembargoed/"; + Disembargo "/srv/security-master.debian.org/queue/unchecked-disembargo/"; }; }; @@ -272,15 +233,17 @@ 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"; s390 "IBM S/390"; sparc "Sun SPARC/UltraSPARC"; amd64 "AMD x86_64 (AMD64)"; + kfreebsd-i386 "GNU/kFreeBSD i386"; + kfreebsd-amd64 "GNU/kFreeBSD amd64"; }; @@ -332,31 +295,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; @@ -364,8 +341,11 @@ Section text; utils; web; + vcs; + video; x11; - non-US; + xfce; + zope; }; Priority @@ -387,18 +367,12 @@ OverrideType Location { - /org/security.debian.org/ftp/dists/ - { - Archive "security"; - Type "legacy"; - }; - - /org/security.debian.org/ftp/pool/ + /srv/security-master.debian.org/ftp/pool/ { Archive "security"; Suites { - Oldstable; + OldStable; Stable; Testing; };