X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=9763d1be9e9d223fcaa967f21080eeb19bb9a1d8;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=31195a7420a28ea4ac0d55c4df949150c0ba9dc6;hpb=e0e87158dc6558cce66c233a27713009a3d6bec8;p=dak.git diff --git a/katie.conf-non-US b/katie.conf-non-US index 31195a74..9763d1be 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -1,261 +1,352 @@ Dinstall { - Options - { - Automatic ""; - Debug ""; - Help ""; - Ack-New ""; - Manual-Reject ""; - No-Action ""; - No-Lock ""; - No-Version-Check ""; - No-Mail ""; - Override-Distribution ""; - Version ""; - }; - PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp"; GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; - SendmailCommand "/usr/sbin/sendmail -oi -t"; + SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg"; + SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + SigningKeyIds "1DB114E0"; + 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() - NewAckList "/org/non-us.debian.org/katie/log"; + MyDistribution "Debian"; // Used in emails + BugServer "bugs.debian.org"; + PackagesServer "packages.debian.org"; + TrackingServer "packages.qa.debian.org"; 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/"; }; -Heidi +Julia { + ValidGID "800"; + // Comma separated list of users who are in Postgres but not the passwd file + KnownPostgres "udmsearch,postgres,www-data,katie,auric"; +}; +Shania +{ Options { - Add ""; - Debug ""; - Help ""; - List ""; - Remove ""; - Set ""; - Version ""; + Days 14; }; - + MorgueSubDir "shania"; }; -Jenna + +Catherine { + Options + { + Limit 10240; + }; +}; +Natalie +{ Options { - Architecture ""; - Component ""; - Debug ""; - Help ""; - Suite ""; - Verbose ""; - Version ""; + Component "non-US/main"; + Suite "unstable"; + Type "deb"; }; - + ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name }; -Shania +Melanie { - Options { - Debug ""; - Help ""; - Version ""; - Days 14; - Incoming ""; - Mail ""; - No-Action ""; - Verbose ""; + Suite "unstable"; }; - - MorgueSubDir "shania"; + MyEmailAddress "Debian Archive Maintenance "; + LogFile "/home/troup/public_html/removals.txt"; + Bcc "removed-packages@qa.debian.org"; }; Neve { - ExportDir "/org/non-us.debian.org/katie/neve-files/"; - }; Rhona { - - Options // Currently don't do anything - { - Debug ""; - Help ""; - Interactive ""; - Version ""; - }; - // How long (in seconds) dead packages are left before being killed - StayOfExecution 0; // 0 days - MorgueSubDir "rhona"; - OverrideFilename "override.source-only"; + StayOfExecution 129600; // 1.5 days + MorgueSubDir "rhona"; }; Suite { - // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins) - - Experimental - { - Architectures - { - "source" ""; - "all" ""; - "alpha" ""; - "arm" ""; - "i386" ""; - "m68k" ""; - "powerpc" ""; - "sparc" ""; - }; - Announce "debian-devel-changes@lists.debian.org"; - Version "xx"; - Origin "Debian"; - Description "Experimental packages - not released; use at your own risk."; - CodeName "experimental"; - OverrideCodeName "experimental"; - SingleOverrideFile "true"; - Priority "0"; - }; - 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.2r0"; + Version "3.0r4"; Origin "Debian"; - Description "Debian 2.2r1 Released 12th November 2000"; - 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.2r2"; + CopyKatie "/org/non-us.debian.org/queue/proposed-updates/"; + Version "3.0-updates"; Origin "Debian"; - Description "Proposed Updates for Debian 2.2r2 - Not Released"; + Description "Debian 3.0 Proposed Updates - Not Released"; CodeName "proposed-updates"; - OverrideCodeName "potato"; - Priority "2"; + OverrideCodeName "woody"; + OverrideSuite "stable"; + 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" ""; - "i386" ""; - "m68k" ""; - "powerpc" ""; - "sparc" ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; - Version "2.3-testing"; Origin "Debian"; - Description "Debian 2.3 Testing distribution - Not Released"; - Priority "3"; + Description "Debian Testing distribution - Not Released"; + CodeName "sarge"; + OverrideCodeName "sarge"; + Priority "5"; + }; + + Testing-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 "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" ""; - "m68k" ""; - "mips" ""; - "mipsel" ""; - "powerpc" ""; - "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"; - Version "2.3"; Origin "Debian"; - Description "Debian 2.3 Unstable - Not Released"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "4"; + Description "Debian Unstable - Not Released"; + CodeName "sid"; + OverrideCodeName "sid"; + 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/"; - IncomingDir "/org/non-us.debian.org/incoming/"; - OverrideDir "/org/non-us.debian.org/scripts/override/"; - ListsDir "/org/non-us.debian.org/database/dists/"; + 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 { - Host "non-us.debian.org"; + Name "projectb"; + Host ""; Port -1; - ROUser "nobody"; }; Architectures @@ -266,12 +357,14 @@ 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"; sparc "Sun SPARC/UltraSPARC"; @@ -283,6 +376,7 @@ Archive non-US { OriginServer "non-us.debian.org"; + PrimaryMirror "non-us.debian.org"; Description "Non-US Archive for the Debian project"; }; @@ -311,34 +405,74 @@ Component }; -Location +Section { - - // Old style locations on non-US.debian.org - /org/non-us.debian.org/ftp/dists/proposed-updates/ + non-US; + +}; + +Priority +{ + + required 1; + important 2; + standard 3; + optional 4; + extra 5; + source 0; // i.e. unused + +}; + +OverrideType +{ + + deb; + udeb; + dsc; + +}; + +Location +{ + /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"; }; }; + +Urgency +{ + Default "low"; + Valid + { + low; + medium; + high; + emergency; + critical; + }; +};