X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=709e33b265421afb4852496de1824bc7367ff3dd;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=b12b49e38dc81f920a8386a1ed3a98bf46951cea;hpb=4914b5dde7ccfe58b5f88b9852deb0a19b804039;p=dak.git diff --git a/katie.conf-non-US b/katie.conf-non-US index b12b49e3..709e33b2 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 "B8AE9B77 722F1AED"; + SigningKeyIds "722F1AED"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -12,18 +12,26 @@ Dinstall MyDistribution "Debian"; // Used in emails 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"; StableRejector "Martin (Joey) Schulze "; + FutureTimeTravelGrace 28800; // 6 hours + PastCutoffYear "1984"; + SkipTime 300; + CloseBugs "true"; + SuiteSuffix "non-US"; + OverrideDisparityCheck "true"; + StableDislocationSupport "true"; }; Julia { ValidGID "800"; // Comma seperated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,www-data,katie"; + KnownPostgres "postgres,www-data,katie,auric"; }; Shania @@ -35,6 +43,15 @@ Shania MorgueSubDir "shania"; }; + +Catherine +{ + Options + { + Limit 10240; + }; +}; + Natalie { Options @@ -72,57 +89,29 @@ Rhona 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; + i386; + m68k; + powerpc; + sparc; }; Announce "debian-changes@lists.debian.org"; - Version "2.2r5"; + Version "2.2r6"; Origin "Debian"; - Description "Debian 2.2r5 Released 10th January 2002"; + Description "Debian 2.2r6 Released 3rd April 2002"; CodeName "potato"; OverrideCodeName "potato"; Priority "1"; @@ -134,49 +123,62 @@ Suite { Architectures { - source ""; - all ""; - alpha ""; - arm ""; - i386 ""; - m68k ""; - powerpc ""; - sparc ""; + source; + all; + alpha; + arm; + i386; + m68k; + powerpc; + sparc; }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; - Version "2.2r5"; + CopyKatie "/org/non-us.debian.org/queue/proposed-updates/"; + Version "2.2r6"; Origin "Debian"; - Description "Proposed Updates for Debian 2.2r5 - Not Released"; + Description "Proposed Updates for Debian 2.2r6 - Not Released"; CodeName "proposed-updates"; OverrideCodeName "potato"; OverrideSuite "stable"; Priority "2"; + 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"; @@ -189,58 +191,73 @@ Suite { 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"; + OverrideSuite "unstable"; OverrideCodeName "woody"; Priority "4"; + 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"; @@ -248,21 +265,55 @@ Suite CodeName "sid"; OverrideCodeName "sid"; Priority "5"; + VersionChecks + { + MustBeNewerThan + { + Stable; + Proposed-Updates; + Testing; + Woody-Proposed-Updates; + }; + }; }; }; +SuiteMappings +{ + "map stable proposed-updates"; + "map stable-security proposed-updates"; + "map-unreleased stable unstable"; + "map-unreleased proposed-updates unstable"; + "map testing woody-proposed-updates"; + "map testing-security woody-proposed-updates"; + "map-unreleased testing unstable-"; + "map-unreleased woody-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 + { + Root "/org/non-us.debian.org/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 @@ -331,7 +382,7 @@ Component Section { - non-US ""; + non-US; }; @@ -350,9 +401,9 @@ Priority OverrideType { - deb ""; - udeb ""; - dsc ""; + deb; + udeb; + dsc; }; @@ -373,8 +424,8 @@ Location Archive "non-US"; Suites { - Stable ""; - Unstable ""; + Stable; + Unstable; }; Type "legacy"; }; @@ -388,8 +439,16 @@ Location }; -Catherine { - Options { - Limit 10240; - }; +Urgency +{ + Default "low"; + Valid + { + low; + medium; + high; + emergency; + critical; + }; }; +