X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=aa729c37675f667200cda973df0337ecd2921b95;hb=ebbb5c16d0a0ea9350bf1c139c8265dc2f470b6a;hp=dfd12bf96234d74c11d4c6fb3b23ac25ca5b9365;hpb=ec257c02a5d62fd27844c70814acd9616b24b4c8;p=dak.git diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index dfd12bf9..aa729c37 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -1,20 +1,16 @@ Dinstall { - 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 "; + 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-master.debian.org/dak/lock"; Bcc "archive@ftp-master.debian.org"; // GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours @@ -23,17 +19,11 @@ Dinstall CloseBugs "false"; OverrideDisparityCheck "false"; BXANotify "false"; - QueueBuildSuites - { - stable; - testing; - }; - SecurityQueueHandling "true"; - SecurityQueueBuild "true"; DefaultSuite "stable"; - SuiteSuffix "updates"; + SuiteSuffix "updates/"; OverrideMaintainer "dak@security.debian.org"; LegacyStableHasNoSections "false"; + AllowSourceOnlyUploads "true"; }; Process-New @@ -46,7 +36,7 @@ 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 @@ -60,14 +50,6 @@ Queue-Report }; }; -Import-Keyring -{ - /srv/keyring.debian.org/keyrings/debian-maintainers.gpg - { - Debian-Maintainer "true"; - }; -}; - Import-LDAP-Fingerprints { LDAPDn "ou=users,dc=debian,dc=org"; @@ -118,16 +100,10 @@ Rm LogFile "/srv/security-master.debian.org/dak-log/removals.txt"; }; -Init-Archive -{ - ExportDir "/srv/security-master.debian.org/dak/import-archive-files/"; -}; - Clean-Suites { // How long (in seconds) dead packages are left before being killed StayOfExecution 129600; // 1.5 days - QueueBuildStayOfExecution 86400; // 24 hours MorgueSubDir "pool"; OverrideFilename "override.source-only"; }; @@ -150,7 +126,7 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by 'dak make-maintainers' (highest wins). - Stable + OldStable { Components { @@ -169,7 +145,7 @@ Suite CopyDotDak "/srv/security-master.debian.org/queue/done/"; }; - Testing + Stable { Components { @@ -181,12 +157,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 @@ -198,37 +193,40 @@ 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"; + Holding "/srv/security-master.debian.org/queue/holding/"; + Done "/srv/security-master.debian.org/queue/done/"; + Reject "/srv/security-master.debian.org/queue/reject/"; + Queue { 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 + 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/"; @@ -238,10 +236,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 @@ -278,29 +279,6 @@ Archive }; -Component -{ - - updates/main - { - Description "Main (updates)"; - MeetsDFSG "true"; - }; - - updates/contrib - { - Description "Contrib (updates)"; - MeetsDFSG "true"; - }; - - updates/non-free - { - Description "Software that fails to meet the DFSG"; - MeetsDFSG "false"; - }; - -}; - ComponentMappings { "main updates/main"; @@ -377,28 +355,6 @@ Priority source 0; // i.e. unused }; -OverrideType -{ - deb; - udeb; - dsc; -}; - -Location -{ - /srv/security-master.debian.org/ftp/pool/ - { - Archive "security"; - Suites - { - OldStable; - Stable; - Testing; - }; - Type "pool"; - }; -}; - Urgency { Default "low"; @@ -411,3 +367,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; + }; +}