X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-security;h=3d6e6198f3324552085f27cc146b1a635ed6aa52;hb=2286ce0734fe5dadf2b601165f56d2ebb5a91a5a;hp=c75d15d3a86871b2244b829a5c4484b1648d3a6b;hpb=2c0b25e493964a57357cd76edf251077079a7f34;p=dak.git diff --git a/katie.conf-security b/katie.conf-security index c75d15d3..3d6e6198 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 "1DB114E0"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -15,49 +15,49 @@ 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 { - potato; - woody; + stable; + testing; }; - SecurityAcceptedAutoBuild "true"; - DefaultSuite "Woody"; + SecurityQueueBuild "true"; + DefaultSuite "Testing"; + SuiteSuffix "updates"; OverrideMaintainer "katie@security.debian.org"; - StableDislocationSupport "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"; }; -Shania +Helena { - Options + Directories { - Days 14; - }; - MorgueSubDir "shania"; + byhand; + new; + accepted; + }; }; -Natalie +Shania { Options { - Component "main"; - Suite "unstable"; - Type "deb"; - }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name + Days 14; + }; + MorgueSubDir "shania"; }; Melanie @@ -65,10 +65,10 @@ Melanie Options { Suite "unstable"; - }; + }; - MyEmailAddress "Debian Archive Maintenance "; - LogFile "/org/security.debian.org/web/removals.txt"; + MyEmailAddress "Debian Archive Maintenance "; + LogFile "/org/security.debian.org/katie-log/removals.txt"; }; Neve @@ -80,15 +80,22 @@ 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"; }; Amber { - UploadHost "ftp-master.debian.org"; - UploadDir "/pub/UploadQueue"; + ComponentMappings + { + main "ftp-master.debian.org:/pub/UploadQueue"; + contrib "ftp-master.debian.org:/pub/UploadQueue"; + non-free "ftp-master.debian.org:/pub/UploadQueue"; + non-US/main "non-us.debian.org:/pub/UploadQueue"; + non-US/contrib "non-us.debian.org:/pub/UploadQueue"; + non-US/non-free "non-us.debian.org:/pub/UploadQueue"; + }; }; Suite @@ -96,13 +103,13 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by charisma (highest wins). - Potato + Stable { Components { - main; - contrib; - non-free; + updates/main; + updates/contrib; + updates/non-free; }; Architectures { @@ -110,28 +117,33 @@ 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/updates"; - OverrideCodeName "potato"; + Description "Debian 3.0 Security Updates"; + CodeName "woody"; + OverrideCodeName "woody"; CopyKatie "/org/security.debian.org/queue/done/"; }; - Woody + Testing { Components { - main; - contrib; - non-free; + updates/main; + updates/contrib; + updates/non-free; }; Architectures { @@ -150,12 +162,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/updates"; - OverrideCodeName "woody"; + Description "Debian x.y Security Updates"; + CodeName "sarge"; + OverrideCodeName "sarge"; CopyKatie "/org/security.debian.org/queue/done/"; }; @@ -163,8 +175,10 @@ Suite SuiteMappings { - "map stable-security potato"; - "map testing-security woody"; + "silent-map stable-security stable"; + // JT - FIXME, hackorama + "silent-map testing-security stable"; + //"silent-map testing-security testing"; }; Dir @@ -180,10 +194,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/"; @@ -209,12 +222,12 @@ Architectures all "Architecture Independent"; alpha "DEC Alpha"; hppa "HP PA RISC"; - arm "Arm"; + arm "ARM"; i386 "Intel ia32"; ia64 "Intel ia64"; m68k "Motorola Mc680x0"; - mips "SGI MIPS"; - mipsel "SGI MIPS (Little Endian)"; + mips "MIPS (Big Endian)"; + mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; s390 "IBM S/390"; sparc "Sun SPARC/UltraSPARC"; @@ -236,19 +249,19 @@ Archive Component { - main + updates/main { - Description "Main"; + Description "Main (updates)"; MeetsDFSG "true"; }; - contrib + updates/contrib { - Description "Contrib"; + Description "Contrib (updates)"; MeetsDFSG "true"; }; - non-free + updates/non-free { Description "Software that fails to meet the DFSG"; MeetsDFSG "false"; @@ -256,6 +269,16 @@ Component }; +ComponentMappings +{ + "main updates/main"; + "contrib updates/contrib"; + "non-free updates/non-free"; + "non-US/main updates/main"; + "non-US/contrib updates/contrib"; + "non-US/non-free updates/non-free"; +}; + Section { admin; @@ -266,10 +289,14 @@ Section doc; editors; electronics; + embedded; games; + gnome; graphics; hamradio; interpreters; + kde; + libdevel; libs; mail; math; @@ -278,6 +305,8 @@ Section news; oldlibs; otherosfs; + perl; + python; science; shells; sound; @@ -311,16 +340,17 @@ Location /org/security.debian.org/ftp/dists/ { Archive "security"; - Suites - { - Potato; - }; Type "legacy"; }; /org/security.debian.org/ftp/pool/ { Archive "security"; + Suites + { + Stable; + Testing; + }; Type "pool"; }; };