X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-security;h=2e3f133e31e21cb88ad5842e7497c430b2c39176;hb=7bf33bd6fc9101450df8c928b5d4410d78de11a9;hp=384246c82d6f0d015f5bc32d6fd75719b31d94c2;hpb=b981d2124dad87cd181b5218cc0cf7764298b896;p=dak.git diff --git a/katie.conf-security b/katie.conf-security index 384246c8..2e3f133e 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,19 +15,20 @@ 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"; @@ -38,8 +39,18 @@ Dinstall 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 @@ -47,7 +58,7 @@ Shania Options { Days 14; - }; + }; MorgueSubDir "shania"; }; @@ -56,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 @@ -71,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"; }; @@ -94,7 +105,7 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by charisma (highest wins). - OldStable + Oldstable { Components { @@ -108,18 +119,23 @@ 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/"; }; @@ -135,7 +151,8 @@ Suite { source; all; - alpha; + alpha; + amd64; arm; hppa; i386; @@ -148,12 +165,12 @@ Suite sparc; }; Announce "katie@security.debian.org"; - Version "3.0"; + Version "3.1"; Origin "Debian"; Label "Debian-Security"; - Description "Debian 3.0 Security Updates"; - CodeName "woody"; - OverrideCodeName "woody"; + Description "Debian 3.1 Security Updates"; + CodeName "sarge"; + OverrideCodeName "sarge"; CopyKatie "/org/security.debian.org/queue/done/"; }; @@ -169,6 +186,7 @@ Suite { source; all; + amd64; alpha; arm; hppa; @@ -186,8 +204,8 @@ Suite Origin "Debian"; Label "Debian-Security"; Description "Debian x.y Security Updates"; - CodeName "sarge"; - OverrideCodeName "sarge"; + CodeName "etch"; + OverrideCodeName "etch"; CopyKatie "/org/security.debian.org/queue/done/"; }; @@ -195,11 +213,11 @@ Suite SuiteMappings { - "silent-map oldstable-security oldstable"; + "silent-map oldstable-security oldstable"; "silent-map stable-security stable"; // JT - FIXME, hackorama - "silent-map testing-security stable"; - //"silent-map testing-security testing"; + // "silent-map testing-security stable"; + "silent-map testing-security testing"; }; Dir @@ -215,10 +233,9 @@ Dir 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/"; @@ -226,6 +243,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/uncheckecked-disembargo/"; }; }; @@ -253,6 +274,7 @@ Architectures powerpc "PowerPC"; s390 "IBM S/390"; sparc "Sun SPARC/UltraSPARC"; + amd64 "AMD x86_64 (AMD64)"; }; @@ -311,10 +333,14 @@ Section doc; editors; electronics; + embedded; games; + gnome; graphics; hamradio; interpreters; + kde; + libdevel; libs; mail; math; @@ -323,6 +349,8 @@ Section news; oldlibs; otherosfs; + perl; + python; science; shells; sound; @@ -356,17 +384,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"; }; };