X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=9763d1be9e9d223fcaa967f21080eeb19bb9a1d8;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=b4a6aab189c68cd738beb831e68e4c12f9bfa135;hpb=dc84b331ae0292d0dd01c03bbf76054c8da41499;p=dak.git diff --git a/katie.conf-non-US b/katie.conf-non-US index b4a6aab1..9763d1be 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -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"; @@ -13,18 +13,33 @@ Dinstall BugServer "bugs.debian.org"; PackagesServer "packages.debian.org"; TrackingServer "packages.qa.debian.org"; - NewAckList "/org/non-us.debian.org/katie/log"; LockFile "/org/non-us.debian.org/katie/lock"; Bcc "archive@ftp-master.debian.org"; GroupOverrideFilename "override.group-maint"; + FutureTimeTravelGrace 28800; // 8 hours + PastCutoffYear "1984"; + SkipTime 300; + CloseBugs "true"; + SuiteSuffix "non-US"; + OverrideDisparityCheck "true"; + StableDislocationSupport "false"; + Reject + { + NoSourceOnly "true"; + }; +}; + +Lauren +{ StableRejector "Martin (Joey) Schulze "; + MoreInfoURL "http://people.debian.org/~joey/3.0r4/"; }; Julia { ValidGID "800"; - // Comma seperated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,www-data,katie,auric"; + // Comma separated list of users who are in Postgres but not the passwd file + KnownPostgres "udmsearch,postgres,www-data,katie,auric"; }; Shania @@ -36,6 +51,15 @@ Shania MorgueSubDir "shania"; }; + +Catherine +{ + Options + { + Limit 10240; + }; +}; + Natalie { Options @@ -68,202 +92,254 @@ Rhona // How long (in seconds) dead packages are left before being killed StayOfExecution 129600; // 1.5 days MorgueSubDir "rhona"; - OverrideFilename "override.source-only"; }; Suite { - // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins) - - // non-US doesn't have experimental (yet) -// Experimental -// { -// Architectures -// { -// source ""; -// all ""; -// alpha ""; -// arm ""; -// i386 ""; -// m68k ""; -// powerpc ""; -// sparc ""; -// }; -// Announce "debian-devel-changes@lists.debian.org"; -// Origin "Debian"; -// Description "Experimental packages - not released; use at your own risk."; -// CodeName "experimental"; -// OverrideCodeName "experimental"; -// SingleOverrideFile "true"; -// NotAutomatic "yes"; -// Priority "0"; -// Tree "project/experimental"; -// }; - Stable { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - i386 ""; - m68k ""; - powerpc ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Announce "debian-changes@lists.debian.org"; - Version "2.2r5"; + Version "3.0r4"; Origin "Debian"; - Description "Debian 2.2r5 Released 10th January 2002"; - CodeName "potato"; - OverrideCodeName "potato"; - Priority "1"; + Description "Debian 3.0r4 Released 31st December 2004"; + CodeName "woody"; + OverrideCodeName "woody"; + Priority "3"; Untouchable "1"; ChangeLogBase "dists/stable/non-US/"; }; Proposed-Updates { + Components + { + non-US/main; + non-US/contrib; + non-US/non-free; + }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - i386 ""; - m68k ""; - powerpc ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; - Version "2.2r5"; + CopyKatie "/org/non-us.debian.org/queue/proposed-updates/"; + Version "3.0-updates"; Origin "Debian"; - Description "Proposed Updates for Debian 2.2r5 - Not Released"; + Description "Debian 3.0 Proposed Updates - Not Released"; CodeName "proposed-updates"; - OverrideCodeName "potato"; + OverrideCodeName "woody"; OverrideSuite "stable"; - Priority "2"; + Priority "4"; + VersionChecks + { + MustBeNewerThan + { + Stable; + }; + MustBeOlderThan + { + Unstable; + Experimental; + }; + }; }; Testing { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Origin "Debian"; Description "Debian Testing distribution - Not Released"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "3"; + CodeName "sarge"; + OverrideCodeName "sarge"; + Priority "5"; }; - Woody-Proposed-Updates + Testing-Proposed-Updates { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; - CodeName "woody-proposed-updates"; - OverrideCodeName "woody"; - Priority "4"; + CodeName "testing-proposed-updates"; + OverrideCodeName "sarge"; + OverrideSuite "unstable"; + Priority "6"; + VersionChecks + { + MustBeNewerThan + { + Stable; + Proposed-Updates; + Testing; + }; + MustBeOlderThan + { + Unstable; + Experimental; + }; + }; }; Unstable { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - hurd-i386 ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sh ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + hurd-i386; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sh; + sparc; }; Announce "debian-devel-changes@lists.debian.org"; Origin "Debian"; Description "Debian Unstable - Not Released"; CodeName "sid"; OverrideCodeName "sid"; - Priority "5"; + Priority "7"; + VersionChecks + { + MustBeNewerThan + { + Stable; + Proposed-Updates; + Testing; + Testing-Proposed-Updates; + }; + }; }; }; +SuiteMappings +{ + // JT - temp measure + "map testing-security proposed-updates"; + + "map stable proposed-updates"; + "map stable-security proposed-updates"; + "map-unreleased stable unstable"; + "map-unreleased proposed-updates unstable"; + "map testing testing-proposed-updates"; + //"map testing-security testing-proposed-updates"; + "map-unreleased testing unstable"; + "map-unreleased testing-proposed-updates unstable"; +}; + Dir { - RootDir "/org/non-us.debian.org/ftp/"; - PoolDir "/org/non-us.debian.org/ftp/pool/"; + Root "/org/non-us.debian.org/ftp/"; + Pool "/org/non-us.debian.org/ftp/pool/"; PoolRoot "pool/"; - TemplatesDir "/org/non-us.debian.org/katie/templates/"; - IncomingDir "/org/non-us.debian.org/incoming/"; - OverrideDir "/org/non-us.debian.org/scripts/override/"; - ListsDir "/org/non-us.debian.org/database/dists/"; - LogDir "/org/non-us.debian.org/log/"; + Templates "/org/non-us.debian.org/katie/templates/"; + Override "/org/non-us.debian.org/scripts/override/"; + Lists "/org/non-us.debian.org/database/dists/"; + Log "/org/non-us.debian.org/log/"; Morgue "/org/non-us.debian.org/morgue/"; + MorgueReject "reject"; + UrgencyLog "/org/non-us.debian.org/testing/"; + Queue + { + Accepted "/org/non-us.debian.org/queue/accepted/"; + Byhand "/org/non-us.debian.org/queue/byhand/"; + Done "/org/non-us.debian.org/queue/done/"; + Holding "/org/non-us.debian.org/queue/holding/"; + New "/org/non-us.debian.org/queue/new/"; + Reject "/org/non-us.debian.org/queue/reject/"; + Unchecked "/org/non-us.debian.org/queue/unchecked/"; + }; }; DB @@ -281,12 +357,12 @@ Architectures alpha "DEC Alpha"; hurd-i386 "Intel ia32 running the HURD"; 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"; sh "Hitatchi SuperH"; @@ -332,7 +408,7 @@ Component Section { - non-US ""; + non-US; }; @@ -351,46 +427,52 @@ Priority OverrideType { - deb ""; - udeb ""; - dsc ""; + deb; + udeb; + dsc; }; Location { - - // Old style locations on non-US.debian.org - - /org/non-us.debian.org/ftp/dists/proposed-updates/ + /org/non-us.debian.org/ftp/dists/ { Archive "non-US"; - Suite "proposed-updates"; - Type "legacy-mixed"; + Type "legacy"; }; - /org/non-us.debian.org/ftp/dists/ + /org/non-us.debian.org/ftp/dists/old-proposed-updates/ { Archive "non-US"; - Suites - { - Stable ""; - Unstable ""; - }; - Type "legacy"; + Type "legacy-mixed"; }; - // New pool locations on non-US.debian.org /org/non-us.debian.org/ftp/pool/ { Archive "non-US"; + Suites + { + OldStable; + Stable; + Proposed-Updates; + Testing; + Testing-Proposed-Updates; + Unstable; + }; Type "pool"; }; }; -Catherine { - Options { - Limit 10240; - }; +Urgency +{ + Default "low"; + Valid + { + low; + medium; + high; + emergency; + critical; + }; };