X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=5f09abf2a84c643fa9d7e9dba7976b468a37f127;hb=70f6c4de94c2d2e1bb76e165a2f15aaf0184215c;hp=fb92741aa02265b78d764d94d17d0aaeae2f5eaf;hpb=4a267a9e31e7ae7c08189e5d23944d569da4116c;p=dak.git diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index fb92741a..5f09abf2 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -1,20 +1,20 @@ Dinstall { GPGKeyring { - "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/org/keyring.debian.org/keyrings/debian-keyring.pgp"; + "/srv/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 "6070D3A1"; + // 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 "; + MyEmailAddress "Debian FTP Masters "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() 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 @@ -25,38 +25,76 @@ Dinstall BXANotify "false"; QueueBuildSuites { - oldstable; stable; testing; }; SecurityQueueHandling "true"; SecurityQueueBuild "true"; - DefaultSuite "oldstable"; - SuiteSuffix "updates"; + DefaultSuite "stable"; + SuiteSuffix "updates/"; OverrideMaintainer "dak@security.debian.org"; - StableDislocationSupport "false"; LegacyStableHasNoSections "false"; }; Process-New { - AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock"; + DinstallLockFile "/srv/security-master.debian.org/lock/processnew.lock"; + LockDir "/srv/security-master.debian.org/lock/new/"; }; Import-Users-From-Passwd { ValidGID "800"; // Comma separated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,dak,www-data,udmsearch"; + KnownPostgres "postgres,dak,www-data,udmsearch,repuser"; }; Queue-Report { Directories { - // byhand; - // new; + byhand; + new; unembargoed; + embargoed; + }; +}; + +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"; +}; + +Check-Overrides +{ + OverrideSuites + { + Stable + { + Process "0"; + }; + + Testing + { + Process "0"; + }; + }; }; @@ -77,12 +115,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 @@ -112,7 +150,7 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by 'dak make-maintainers' (highest wins). - Oldstable + OldStable { Components { @@ -120,151 +158,116 @@ 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/"; }; Stable { - Components + Components { updates/main; updates/contrib; updates/non-free; }; - Architectures - { - source; - all; - amd64; - alpha; - arm; - hppa; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "dak@security.debian.org"; Version ""; Origin "Debian"; Label "Debian-Security"; - Description "Debian 4.0 Security Updates"; - CodeName "etch"; - OverrideCodeName "etch"; - CopyDotDak "/org/security.debian.org/queue/done/"; + Description "Debian 6.0 Security Updates"; + ValidTime 864000; // 10 days + CodeName "squeeze"; + OverrideCodeName "squeeze"; + 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; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "dak@security.debian.org"; Version ""; Origin "Debian"; Label "Debian-Security"; Description "Debian testing Security Updates"; - CodeName "lenny"; - OverrideCodeName "lenny"; - CopyDotDak "/org/security.debian.org/queue/done/"; + ValidTime 864000; // 10 days + CodeName "wheezy"; + OverrideCodeName "wheezy"; + 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 stable"; + "silent-map etch-secure oldstable"; + "silent-map lenny-secure stable"; "silent-map testing-security testing"; + "silent-map lenny-security oldstable"; + "silent-map squeeze-security stable"; + "silent-map wheezy-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/"; + Export "/srv/security-master.debian.org/export/"; + 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/"; - MorgueReject "reject"; - Override "/org/security.debian.org/scripts/override/"; - QueueBuild "/org/security.debian.org/buildd/"; + 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/"; + Override "/srv/security-master.debian.org/scripts/override/"; + QueueBuild "/srv/security-master.debian.org/buildd/"; + Upload "/srv/queued/ftpmaster/"; + TempPath "/srv/security-master.debian.org/tmp"; 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/"; - 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/"; - 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 "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme + OldProposedUpdates "/srv/security-master.debian.org/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/"; }; }; DB { - Name "obscurity"; - Host ""; - Port -1; - + Service "obscurity"; + // PoolSize should be at least ThreadCount + 1 + PoolSize 5; + // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize + MaxOverflow 13; + // should be false for encoding == SQL_ASCII + Unicode "false" }; Architectures @@ -275,15 +278,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"; }; @@ -335,31 +340,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; @@ -367,8 +386,11 @@ Section text; utils; web; + vcs; + video; x11; - non-US; + xfce; + zope; }; Priority @@ -390,18 +412,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; }; @@ -421,3 +437,30 @@ Urgency critical; }; }; + +Changelogs +{ + Export "/srv/security-master.debian.org/export/changelogs"; +} + +Generate-Releases +{ + MD5Sum + { + oldstable; + stable; + testing; + }; + SHA1 + { + oldstable; + stable; + testing; + }; + SHA256 + { + oldstable; + stable; + testing; + }; +}