X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=5f09abf2a84c643fa9d7e9dba7976b468a37f127;hb=70f6c4de94c2d2e1bb76e165a2f15aaf0184215c;hp=6c977a4155e4843901b67e2598ab542b6643ebf7;hpb=1be362fc8d75fe02f54b624be11f4d941e5328fe;p=dak.git diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 6c977a41..5f09abf2 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -8,7 +8,7 @@ Dinstall 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 @@ -31,7 +31,7 @@ Dinstall SecurityQueueHandling "true"; SecurityQueueBuild "true"; DefaultSuite "stable"; - SuiteSuffix "updates"; + SuiteSuffix "updates/"; OverrideMaintainer "dak@security.debian.org"; LegacyStableHasNoSections "false"; }; @@ -46,16 +46,17 @@ 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; }; }; @@ -149,7 +150,7 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by 'dak make-maintainers' (highest wins). - Stable + OldStable { Components { @@ -168,7 +169,7 @@ Suite CopyDotDak "/srv/security-master.debian.org/queue/done/"; }; - Testing + Stable { Components { @@ -180,12 +181,31 @@ Suite Version ""; Origin "Debian"; Label "Debian-Security"; - Description "Debian testing Security Updates"; + Description "Debian 6.0 Security Updates"; ValidTime 864000; // 10 days CodeName "squeeze"; OverrideCodeName "squeeze"; CopyDotDak "/srv/security-master.debian.org/queue/done/"; }; + + Testing + { + Components + { + updates/main; + updates/contrib; + updates/non-free; + }; + Announce "dak@security.debian.org"; + Version ""; + Origin "Debian"; + Label "Debian-Security"; + Description "Debian testing Security Updates"; + ValidTime 864000; // 10 days + CodeName "wheezy"; + OverrideCodeName "wheezy"; + CopyDotDak "/srv/security-master.debian.org/queue/done/"; + }; }; SuiteMappings @@ -197,12 +217,16 @@ 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/"; @@ -212,10 +236,10 @@ Dir 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 { Byhand "/srv/security-master.debian.org/queue/byhand/"; @@ -226,8 +250,8 @@ Dir 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 + 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/"; @@ -237,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 @@ -410,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; + }; +}