X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=db3c64701585c8642b710fd982324542fc0ef5a1;hb=f44698379afcac66997806e421a216de8ad40a31;hp=31cd3de2818612fda62b19ae9989017c128acddf;hpb=b43ed3ff3738940ce46caa836d88b6937a76582c;p=dak.git diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 31cd3de2..db3c6470 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -2,14 +2,13 @@ Dinstall { GPGKeyring { "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; }; // 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 @@ -26,37 +25,76 @@ Dinstall BXANotify "false"; QueueBuildSuites { - oldstable; stable; testing; }; SecurityQueueHandling "true"; SecurityQueueBuild "true"; DefaultSuite "stable"; - SuiteSuffix "updates"; + SuiteSuffix "updates/"; OverrideMaintainer "dak@security.debian.org"; LegacyStableHasNoSections "false"; }; Process-New { - AcceptedLockFile "/srv/security-master.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"; + }; + }; }; @@ -124,16 +162,16 @@ Suite Version ""; Origin "Debian"; Label "Debian-Security"; - Description "Debian 4.0 Security Updates"; + Description "Debian 5.0 Security Updates"; ValidTime 864000; // 10 days - CodeName "etch"; - OverrideCodeName "etch"; + CodeName "lenny"; + OverrideCodeName "lenny"; CopyDotDak "/srv/security-master.debian.org/queue/done/"; }; Stable { - Components + Components { updates/main; updates/contrib; @@ -143,10 +181,10 @@ Suite Version ""; Origin "Debian"; Label "Debian-Security"; - Description "Debian 5.0 Security Updates"; + Description "Debian 6.0 Security Updates"; ValidTime 864000; // 10 days - CodeName "lenny"; - OverrideCodeName "lenny"; + CodeName "squeeze"; + OverrideCodeName "squeeze"; CopyDotDak "/srv/security-master.debian.org/queue/done/"; }; @@ -164,8 +202,8 @@ Suite Label "Debian-Security"; Description "Debian testing Security Updates"; ValidTime 864000; // 10 days - CodeName "squeeze"; - OverrideCodeName "squeeze"; + CodeName "wheezy"; + OverrideCodeName "wheezy"; CopyDotDak "/srv/security-master.debian.org/queue/done/"; }; }; @@ -179,35 +217,41 @@ SuiteMappings "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 "/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 "/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 "/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 "/srv/security-master.debian.org/queue/accepted/"; 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/"; - ProposedUpdates "/does/not/exist/"; // XXX fixme - OldProposedUpdates "/does/not/exist/"; // XXX fixme + 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/"; @@ -217,10 +261,13 @@ Dir 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 @@ -356,13 +403,6 @@ Priority source 0; // i.e. unused }; -OverrideType -{ - deb; - udeb; - dsc; -}; - Location { /srv/security-master.debian.org/ftp/pool/ @@ -390,3 +430,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; + }; +}