X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=709e33b265421afb4852496de1824bc7367ff3dd;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=f6c63f1d52d1b707d74b58c8e8356822a8ce6651;hpb=a925017a5c4ff728988dd655f071bbaa24b947b4;p=dak.git diff --git a/katie.conf-non-US b/katie.conf-non-US index f6c63f1d..709e33b2 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -1,162 +1,74 @@ Dinstall { - Options - { - Automatic ""; - Debug ""; - Help ""; - Ack-New ""; - Manual-Reject ""; - No-Action ""; - No-Lock ""; - No-Mail ""; - Override-Distribution ""; - Version ""; - }; - PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp"; GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg"; - SendmailCommand "/usr/sbin/sendmail -oi -t"; + SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + SigningKeyIds "722F1AED"; + SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() 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"; }; -Heidi +Julia { - - Options - { - Add ""; - Debug ""; - Help ""; - List ""; - Remove ""; - Set ""; - Version ""; - }; - + ValidGID "800"; + // Comma seperated list of users who are in Postgres but not the passwd file + KnownPostgres "postgres,www-data,katie,auric"; }; -Catherine -{ - - Options - { - Debug ""; - Help ""; - Limit ""; - No-Action ""; - Version ""; - }; - -}; - -Tea -{ - - Options - { - Debug ""; - Help ""; - Version ""; - }; - -}; - -Jenna +Shania { - Options { - Architecture ""; - Component ""; - Debug ""; - Help ""; - Suite ""; - Verbose ""; - Version ""; + Days 14; }; - + MorgueSubDir "shania"; }; -Madison -{ - - Options - { - Debug ""; - Help ""; - Suite ""; - Version ""; - }; - -}; -Shania +Catherine { - - Options + Options { - Debug ""; - Help ""; - Version ""; - Days 14; - Incoming ""; - Mail ""; - No-Action ""; - Verbose ""; - }; - - MorgueSubDir "shania"; + Limit 10240; + }; }; Natalie { - Options { - Debug ""; - Help ""; - Version ""; Component "non-US/main"; - List ""; Suite "unstable"; - Set ""; Type "deb"; }; - ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name }; Melanie { - Options { - Debug ""; - Help ""; - Version ""; - Architecture ""; - Binary-Only ""; - Component ""; - Done ""; - No-Action ""; - Partial ""; - Reason ""; - Source-Only ""; Suite "unstable"; }; - MyEmailAddress "Debian Archive Maintenance "; LogFile "/home/troup/public_html/removals.txt"; Bcc "removed-packages@qa.debian.org"; @@ -164,22 +76,11 @@ Melanie Neve { - ExportDir "/org/non-us.debian.org/katie/neve-files/"; - }; Rhona { - - Options - { - Debug ""; - Help ""; - No-Action ""; - Version ""; - }; - // How long (in seconds) dead packages are left before being killed StayOfExecution 129600; // 1.5 days MorgueSubDir "rhona"; @@ -188,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.2r3"; + Version "2.2r6"; Origin "Debian"; - Description "Debian 2.2r3 Released 16th April 2001"; + Description "Debian 2.2r6 Released 3rd April 2002"; CodeName "potato"; OverrideCodeName "potato"; Priority "1"; @@ -250,44 +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.2r4"; + CopyKatie "/org/non-us.debian.org/queue/proposed-updates/"; + Version "2.2r6"; Origin "Debian"; - Description "Proposed Updates for Debian 2.2r4 - 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" ""; - "i386" ""; - "m68k" ""; - "powerpc" ""; - "sparc" ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Origin "Debian"; Description "Debian Testing distribution - Not Released"; @@ -296,53 +187,133 @@ Suite Priority "3"; }; + Woody-Proposed-Updates + { + Components + { + non-US/main; + non-US/contrib; + non-US/non-free; + }; + Architectures + { + 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"; Description "Debian Unstable - Not Released"; CodeName "sid"; OverrideCodeName "sid"; - Priority "4"; + 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 @@ -350,7 +321,6 @@ DB Name "projectb"; Host ""; Port -1; - ROUser "nobody"; }; Architectures @@ -412,28 +382,28 @@ Component Section { - "non-US" ""; + non-US; }; Priority { - "required" 1; - "important" 2; - "standard" 3; - "optional" 4; - "extra" 5; - "source" 0; // i.e. unused + required 1; + important 2; + standard 3; + optional 4; + extra 5; + source 0; // i.e. unused }; OverrideType { - "deb" ""; - "udeb" ""; - "dsc" ""; + deb; + udeb; + dsc; }; @@ -454,8 +424,8 @@ Location Archive "non-US"; Suites { - Stable ""; - Unstable ""; + Stable; + Unstable; }; Type "legacy"; }; @@ -468,3 +438,17 @@ Location }; }; + +Urgency +{ + Default "low"; + Valid + { + low; + medium; + high; + emergency; + critical; + }; +}; +