X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=89b839c4744ffbe2264f3cca3ef222d84e6573b2;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=b277385983100a9c48ad41f4effe9ba7ec6fc83d;hpb=1bee5081a926311b466c79bf8b46b664c7af3120;p=dak.git diff --git a/katie.conf b/katie.conf index b2773859..89b839c4 100644 --- a/katie.conf +++ b/katie.conf @@ -4,7 +4,7 @@ Dinstall GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "722F1AED"; + SigningKeyIds "4F368D5D"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -13,24 +13,59 @@ Dinstall BugServer "bugs.debian.org"; PackagesServer "packages.debian.org"; TrackingServer "packages.qa.debian.org"; - NewAckList "/org/ftp.debian.org/katie/log"; - LockFile "/org/ftp.debian.org/katie/lock"; + LockFile "/org/ftp.debian.org/lock/dinstall.lock"; Bcc "archive@ftp-master.debian.org"; GroupOverrideFilename "override.group-maint"; - StableRejector "Martin (Joey) Schulze "; - FutureTimeTravelGrace 28800; // 6 hours + FutureTimeTravelGrace 28800; // 8 hours PastCutoffYear "1984"; - BXANotify "true"; SkipTime 300; - SpecialAcceptedAutoBuild "true"; + BXANotify "true"; CloseBugs "true"; OverrideDisparityCheck "true"; + StableDislocationSupport "false"; + DefaultSuite "unstable"; + QueueBuildSuites + { + unstable; + }; + Reject + { + NoSourceOnly "true"; + }; +}; + +Tiffani +{ + Options + { + TempDir "/org/ftp.debian.org/tiffani"; + MaxDiffs { Default 90; }; + }; +}; + +Alicia +{ + MyEmailAddress "Debian FTP Masters "; +}; + +Billie +{ + FTPPath "/org/ftp.debian.org/ftp"; + TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots"; + TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs"; + BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k }; + CombinationTrees + { + popular { i386; powerpc; all; source; }; + source { source; }; + everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; }; + }; }; Julia { ValidGID "800"; - // Comma seperated list of users who are in Postgres but not the passwd file + // Comma separated list of users who are in Postgres but not the passwd file KnownPostgres "postgres,katie"; }; @@ -72,18 +107,63 @@ Neve ExportDir "/org/ftp.debian.org/katie/neve-files/"; }; +Lauren +{ + StableRejector "Martin (Joey) Schulze "; + MoreInfoURL "http://people.debian.org/~joey/3.1r2/"; +}; + +Emilie +{ + LDAPDn "ou=users,dc=debian,dc=org"; + LDAPServer "db.debian.org"; + ExtraKeyrings + { + "/org/keyring.debian.org/keyrings/removed-keys.pgp"; + "/org/keyring.debian.org/keyrings/removed-keys.gpg"; + "/org/keyring.debian.org/keyrings/extra-keys.pgp"; + }; + KeyServer "wwwkeys.eu.pgp.net"; +}; + 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"; +}; + +Lisa +{ + AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock"; +}; + +Cindy +{ + OverrideSuites + { + Stable + { + Process "0"; + }; + + Testing + { + Process "1"; + OriginSuite "Unstable"; + }; + + Unstable + { + Process "1"; + }; + }; }; Suite { - Stable + Oldstable { Components { @@ -97,45 +177,99 @@ Suite all; alpha; arm; + hppa; i386; + ia64; m68k; + mips; + mipsel; powerpc; + s390; sparc; }; Announce "debian-changes@lists.debian.org"; - Version "2.2r6"; + Version "3.0r6"; Origin "Debian"; - Description "Debian 2.2r6 Released 3rd April 2002"; - CodeName "potato"; - OverrideCodeName "potato"; + Description "Debian 3.0r6 Released 31 May 2005"; + CodeName "woody"; + OverrideCodeName "woody"; Priority "1"; Untouchable "1"; + }; + + Stable + { + Components + { + main; + contrib; + non-free; + }; + Architectures + { + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; + }; + Announce "debian-changes@lists.debian.org"; + Version "3.1r1"; + Origin "Debian"; + Description "Debian 3.1r1 Released 17 December 2005"; + CodeName "sarge"; + OverrideCodeName "sarge"; + Priority "3"; + Untouchable "1"; ChangeLogBase "dists/stable/"; + UdebComponents + { + main; + }; }; Proposed-Updates { + Components + { + main; + contrib; + non-free; + }; Architectures { source; all; alpha; arm; + hppa; i386; + ia64; m68k; + mips; + mipsel; powerpc; + s390; sparc; }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; CopyKatie "/org/ftp.debian.org/queue/proposed-updates/"; - Version "2.2r6"; + Version "3.1-updates"; Origin "Debian"; - Description "Proposed Updates for Debian 2.2r6 - Not Released"; + Description "Debian 3.1 Proposed Updates - Not Released"; CodeName "proposed-updates"; - OverrideCodeName "potato"; + OverrideCodeName "sarge"; OverrideSuite "stable"; - Priority "2"; + Priority "4"; VersionChecks { MustBeNewerThan @@ -144,9 +278,18 @@ Suite }; MustBeOlderThan { + Testing; Unstable; Experimental; }; + Enhances + { + Stable; + }; + }; + UdebComponents + { + main; }; }; @@ -174,14 +317,19 @@ Suite s390; sparc; }; + Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution - Not Released"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "3"; + CodeName "etch"; + OverrideCodeName "etch"; + Priority "5"; + UdebComponents + { + main; + }; }; - Woody-Proposed-Updates + Testing-Proposed-Updates { Components { @@ -205,12 +353,13 @@ Suite s390; sparc; }; + Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; - CodeName "woody-proposed-updates"; - OverrideCodeName "woody"; - OverrideSuite "unstable"; - Priority "4"; + CodeName "testing-proposed-updates"; + OverrideCodeName "etch"; + OverrideSuite "testing"; + Priority "6"; VersionChecks { MustBeNewerThan @@ -224,6 +373,14 @@ Suite Unstable; Experimental; }; + Enhances + { + Testing; + }; + }; + UdebComponents + { + main; }; }; @@ -258,7 +415,7 @@ Suite Description "Debian Unstable - Not Released"; CodeName "sid"; OverrideCodeName "sid"; - Priority "5"; + Priority "7"; VersionChecks { MustBeNewerThan @@ -266,10 +423,13 @@ Suite Stable; Proposed-Updates; Testing; - Woody-Proposed-Updates; + Testing-Proposed-Updates; }; }; - + UdebComponents + { + main; + }; }; Experimental @@ -314,7 +474,7 @@ Suite Stable; Proposed-Updates; Testing; - Woody-Proposed-Updates; + Testing-Proposed-Updates; Unstable; }; }; @@ -325,12 +485,16 @@ Suite SuiteMappings { + "propup-version stable-security testing testing-proposed-updates unstable"; + "propup-version testing-security unstable"; "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 testing-proposed-updates"; + "map testing-security testing-proposed-updates"; "map-unreleased testing unstable"; - "map-unreleased woody-proposed-updates unstable"; + "map-unreleased testing-proposed-updates unstable"; }; Dir @@ -339,17 +503,16 @@ Dir Pool "/org/ftp.debian.org/ftp/pool/"; Templates "/org/ftp.debian.org/katie/templates/"; PoolRoot "pool/"; - Override "/org/ftp.debian.org/scripts/override/"; Lists "/org/ftp.debian.org/database/dists/"; Log "/org/ftp.debian.org/log/"; + Lock "/org/ftp.debian.org/lock"; Morgue "/org/ftp.debian.org/morgue/"; MorgueReject "reject"; Override "/org/ftp.debian.org/scripts/override/"; - AcceptedAutoBuild "/org/incoming.debian.org/buildd/"; + QueueBuild "/org/incoming.debian.org/buildd/"; UrgencyLog "/org/ftp.debian.org/testing/urgencies/"; Queue { - Root "/org/ftp.debian.org/queue/"; Accepted "/org/ftp.debian.org/queue/accepted/"; Byhand "/org/ftp.debian.org/queue/byhand/"; Done "/org/ftp.debian.org/queue/done/"; @@ -357,6 +520,7 @@ Dir New "/org/ftp.debian.org/queue/new/"; Reject "/org/ftp.debian.org/queue/reject/"; Unchecked "/org/ftp.debian.org/queue/unchecked/"; + BTSVersionTrack "/org/ftp.debian.org/queue/bts_version_track/"; }; }; @@ -380,12 +544,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"; @@ -438,11 +602,15 @@ Section devel; doc; editors; + embedded; electronics; games; + gnome; graphics; hamradio; interpreters; + kde; + libdevel; libs; mail; math; @@ -451,6 +619,8 @@ Section news; oldlibs; otherosfs; + perl; + python; science; shells; sound; @@ -481,34 +651,7 @@ OverrideType Location { - // Old style locations on ftp-master.debian.org - - /org/ftp.debian.org/ftp/project/experimental/ - { - Archive "ftp-master"; - Suite "experimental"; - Type "legacy-mixed"; - }; - - /org/ftp.debian.org/ftp/dists/proposed-updates/ - { - Archive "ftp-master"; - Suite "proposed-updates"; - Type "legacy-mixed"; - }; - - /org/ftp.debian.org/ftp/dists/ - { - Archive "ftp-master"; - Suites - { - Stable; - Unstable; - }; - Type "legacy"; - }; - - // New pool locations on ftp-master.debian.org + // Pool locations on ftp-master.debian.org /org/ftp.debian.org/ftp/pool/ { Archive "ftp-master";