X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-security;h=e5ef686800ade3e99aa19a0489f302aab235365b;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=10ddab8a0eb1826c4bdbeaf17c9b301541407c84;hpb=6a62d466b4d1a1dbdf40b6d297a42da9cc21f4e5;p=dak.git diff --git a/katie.conf-security b/katie.conf-security index 10ddab8a..e5ef6868 100644 --- a/katie.conf-security +++ b/katie.conf-security @@ -4,7 +4,7 @@ Dinstall 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 "722F1AED"; + SigningKeyIds "4F368D5D"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -15,30 +15,42 @@ Dinstall LockFile "/org/security.debian.org/katie/lock"; Bcc "archive@ftp-master.debian.org"; // GroupOverrideFilename "override.group-maint"; - FutureTimeTravelGrace 28800; // 6 hours + FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; SkipTime 300; CloseBugs "false"; OverrideDisparityCheck "false"; BXANotify "false"; - AcceptedAutoBuildSuites + QueueBuildSuites { + oldstable; stable; testing; }; - SecurityAcceptedAutoBuild "true"; + SecurityQueueHandling "true"; + SecurityQueueBuild "true"; DefaultSuite "Testing"; SuiteSuffix "updates"; OverrideMaintainer "katie@security.debian.org"; - StableDislocationSupport "true"; - LegacyStableHasNoSections "true"; + StableDislocationSupport "false"; + LegacyStableHasNoSections "false"; }; Julia { ValidGID "800"; - // Comma seperated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,katie"; + // Comma separated list of users who are in Postgres but not the passwd file + KnownPostgres "postgres,katie,www-data,udmsearch"; +}; + +Helena +{ + Directories + { + byhand; + new; + accepted; + }; }; Shania @@ -46,7 +58,7 @@ Shania Options { Days 14; - }; + }; MorgueSubDir "shania"; }; @@ -55,10 +67,10 @@ Melanie Options { Suite "unstable"; - }; + }; - MyEmailAddress "Debian Archive Maintenance "; - LogFile "/org/security.debian.org/katie-log/removals.txt"; + MyEmailAddress "Debian Archive Maintenance "; + LogFile "/org/security.debian.org/katie-log/removals.txt"; }; Neve @@ -70,7 +82,7 @@ Rhona { // How long (in seconds) dead packages are left before being killed StayOfExecution 129600; // 1.5 days - AcceptedAutoBuildStayOfExecution 86400; // 24 hours + QueueBuildStayOfExecution 86400; // 24 hours MorgueSubDir "rhona"; OverrideFilename "override.source-only"; }; @@ -93,7 +105,7 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by charisma (highest wins). - Stable + Oldstable { Components { @@ -107,18 +119,58 @@ Suite all; alpha; arm; + hppa; i386; + ia64; m68k; + mips; + mipsel; powerpc; + s390; sparc; }; Announce "katie@security.debian.org"; - Version "2.2"; + Version "3.0"; Origin "Debian"; Label "Debian-Security"; - Description "Debian 2.2 Security Updates"; - CodeName "potato"; - OverrideCodeName "potato"; + Description "Debian 3.0 Security Updates"; + CodeName "woody"; + OverrideCodeName "woody"; + CopyKatie "/org/security.debian.org/queue/done/"; + }; + + Stable + { + Components + { + updates/main; + updates/contrib; + updates/non-free; + }; + Architectures + { + source; + all; + alpha; + amd64; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; + }; + Announce "katie@security.debian.org"; + Version "3.1"; + Origin "Debian"; + Label "Debian-Security"; + Description "Debian 3.1 Security Updates"; + CodeName "sarge"; + OverrideCodeName "sarge"; CopyKatie "/org/security.debian.org/queue/done/"; }; @@ -134,6 +186,7 @@ Suite { source; all; + amd64; alpha; arm; hppa; @@ -147,12 +200,12 @@ Suite sparc; }; Announce "katie@security.debian.org"; - Version "3.0"; + Version "x.y"; Origin "Debian"; Label "Debian-Security"; - Description "Debian 3.0 Security Updates"; - CodeName "woody"; - OverrideCodeName "woody"; + Description "Debian x.y Security Updates"; + CodeName "etch"; + OverrideCodeName "etch"; CopyKatie "/org/security.debian.org/queue/done/"; }; @@ -160,8 +213,11 @@ Suite SuiteMappings { + "silent-map oldstable-security oldstable"; "silent-map stable-security stable"; - "silent-map testing-security testing"; + // JT - FIXME, hackorama + // "silent-map testing-security stable"; + "silent-map testing-security testing"; }; Dir @@ -172,15 +228,15 @@ Dir Templates "/org/security.debian.org/katie/templates/"; PoolRoot "pool/"; Override "/org/security.debian.org/override/"; + Lock "/org/security.debian.org/lock/"; Lists "/org/security.debian.org/katie-database/dists/"; Log "/org/security.debian.org/katie-log/"; Morgue "/org/security.debian.org/morgue/"; MorgueReject "reject"; Override "/org/security.debian.org/scripts/override/"; - AcceptedAutoBuild "/org/security.debian.org/buildd/"; + QueueBuild "/org/security.debian.org/buildd/"; Queue { - Root "/org/security.debian.org/queue/"; Accepted "/org/security.debian.org/queue/accepted/"; Byhand "/org/security.debian.org/queue/byhand/"; Done "/org/security.debian.org/queue/done/"; @@ -188,6 +244,10 @@ Dir 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/"; }; }; @@ -215,6 +275,7 @@ Architectures powerpc "PowerPC"; s390 "IBM S/390"; sparc "Sun SPARC/UltraSPARC"; + amd64 "AMD x86_64 (AMD64)"; }; @@ -273,10 +334,14 @@ Section doc; editors; electronics; + embedded; games; + gnome; graphics; hamradio; interpreters; + kde; + libdevel; libs; mail; math; @@ -285,6 +350,8 @@ Section news; oldlibs; otherosfs; + perl; + python; science; shells; sound; @@ -318,17 +385,18 @@ Location /org/security.debian.org/ftp/dists/ { Archive "security"; - Suites - { - Stable; - Testing; - }; Type "legacy"; }; /org/security.debian.org/ftp/pool/ { Archive "security"; + Suites + { + Oldstable; + Stable; + Testing; + }; Type "pool"; }; };