X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=192a039b29f16bc6ed234aafbaad3e32f745ec6a;hb=c91ff0bda6190f7b80b7976b578c10e68f97c5b1;hp=243df1ccc247321bdbd189927b9b86d63183ba3c;hpb=c3716905df27ae0470651380099a7781ea5f79ed;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 243df1cc..192a039b 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -6,10 +6,9 @@ Dinstall }; SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "55BE302B"; // SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org"; SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org"; - MyEmailAddress "Archive Administrator "; + MyEmailAddress "Debian FTP Masters "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails @@ -26,10 +25,6 @@ Dinstall OverrideDisparityCheck "true"; DefaultSuite "unstable"; LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; - QueueBuildSuites - { - unstable; - }; Reject { NoSourceOnly "true"; @@ -59,25 +54,6 @@ Generate-Index-Diffs }; }; -Override -{ - MyEmailAddress "Debian FTP Masters "; -}; - -Mirror-Split -{ - FTPPath "/srv/ftp-master.debian.org/ftp"; - TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots"; - TreeDatabasePath "/srv/ftp-master.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; }; - }; -}; - Show-New { HTMLPath "/srv/ftp.debian.org/web/new/"; @@ -86,7 +62,7 @@ Show-New Show-Deferred { LinkPath "/srv/ftp.debian.org/web/deferred/"; - DeferredQueue "/srv/queued/DEFERRED/"; + DeferredQueue "/srv/upload.debian.org/DEFERRED/"; } Import-Users-From-Passwd @@ -124,8 +100,8 @@ Rm Suite "unstable"; }; - MyEmailAddress "Debian Archive Maintenance "; LogFile "/srv/ftp.debian.org/web/removals.txt"; + LogFile822 "/srv/ftp.debian.org/web/removals.822"; Bcc "removed-packages@qa.debian.org"; }; @@ -142,13 +118,6 @@ Import-Keyring }; }; -Reject-Proposed-Updates -{ - StableRejector "the Stable Release Team"; - StableMail "debian-release@lists.debian.org"; - MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/"; -}; - Import-LDAP-Fingerprints { LDAPDn "ou=users,dc=debian,dc=org"; @@ -166,7 +135,6 @@ Clean-Suites { // How long (in seconds) dead packages are left before being killed StayOfExecution 129600; // 1.5 days - QueueBuildStayOfExecution 86400; // 24 hours MorgueSubDir "pool"; }; @@ -208,19 +176,6 @@ Suite contrib; non-free; }; - Announce "debian-changes@lists.debian.org"; - // Version "5.0r0"; - Origin "Debian"; - // Description "Debian 5.0r0 Released 14 February 2009"; - CodeName "lenny"; - OverrideCodeName "lenny"; - Priority "5"; - ChangeLogBase "dists/stable/"; - UdebComponents - { - main; - non-free; - }; }; Proposed-Updates @@ -231,18 +186,6 @@ Suite contrib; non-free; }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/proposed-updates/"; - CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/"; - CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/"; - Version "5.0-updates"; - Origin "Debian"; - Description "Debian 5.0 Proposed Updates - Not Released"; - CodeName "lenny-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - Priority "4"; VersionChecks { MustBeNewerThan @@ -261,11 +204,6 @@ Suite Stable; }; }; - UdebComponents - { - main; - non-free; - }; }; Testing @@ -276,18 +214,6 @@ Suite contrib; non-free; }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Testing distribution - Not Released"; - CodeName "squeeze"; - OverrideCodeName "squeeze"; - ValidTime 604800; // 7 days - Priority "5"; - UdebComponents - { - main; - non-free; - }; }; Testing-Proposed-Updates @@ -298,14 +224,6 @@ Suite contrib; non-free; }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Testing distribution updates - Not Released"; - CodeName "squeeze-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - Priority "6"; VersionChecks { MustBeNewerThan @@ -325,11 +243,29 @@ Suite Testing; }; }; - UdebComponents + }; + + Squeeze-Volatile + { + Components { main; + contrib; non-free; }; + VersionChecks + { + MustBeNewerThan + { + Stable; + Testing; + }; + Enhances + { + Testing; + }; + }; + }; Unstable @@ -340,13 +276,6 @@ Suite contrib; non-free; }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Unstable - Not Released"; - CodeName "sid"; - OverrideCodeName "sid"; - ValidTime 604800; // 7 days - Priority "7"; VersionChecks { MustBeNewerThan @@ -358,11 +287,6 @@ Suite Testing-Proposed-Updates; }; }; - UdebComponents - { - main; - non-free; - }; }; Experimental @@ -373,15 +297,6 @@ Suite contrib; non-free; }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Experimental packages - not released; use at your own risk."; - CodeName "experimental"; - NotAutomatic "yes"; - OverrideCodeName "sid"; - OverrideSuite "unstable"; - ValidTime 604800; // 7 days - Priority "0"; VersionChecks { MustBeNewerThan @@ -394,11 +309,6 @@ Suite Unstable; }; }; - UdebComponents - { - main; - non-free; - }; }; }; @@ -456,12 +366,12 @@ Dir Templates "/srv/ftp-master.debian.org/dak/templates/"; PoolRoot "pool/"; Lists "/srv/ftp-master.debian.org/database/dists/"; + Cache "/srv/ftp-master.debian.org/database/"; Log "/srv/ftp-master.debian.org/log/"; Lock "/srv/ftp-master.debian.org/lock"; Morgue "/srv/ftp-master.debian.org/morgue/"; MorgueReject "reject"; Override "/srv/ftp-master.debian.org/scripts/override/"; - QueueBuild "/srv/incoming.debian.org/buildd/"; UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; TempPath "/srv/ftp-master.debian.org/tmp/"; Queue @@ -469,6 +379,7 @@ Dir Byhand "/srv/ftp-master.debian.org/queue/byhand/"; ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/"; + ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; Done "/srv/ftp-master.debian.org/queue/done/"; Holding "/srv/ftp-master.debian.org/queue/holding/"; New "/srv/ftp-master.debian.org/queue/new/"; @@ -497,28 +408,6 @@ DB Port 5433; }; -Architectures -{ - source "Source"; - all "Architecture Independent"; - alpha "DEC Alpha"; - hurd-i386 "Intel ia32 running the HURD"; - hppa "HP PA RISC"; - amd64 "AMD64"; - arm "ARM"; - armel "ARM eabi"; - i386 "Intel ia32"; - ia64 "Intel ia64"; - m68k "Motorola Mc680x0"; - mips "MIPS (Big Endian)"; - mipsel "MIPS (Little Endian)"; - powerpc "PowerPC"; - s390 "IBM S/390"; - sparc "Sun SPARC/UltraSPARC"; - kfreebsd-i386 "GNU/kFreeBSD i386"; - kfreebsd-amd64 "GNU/kFreeBSD amd64"; -}; - Archive { ftp-master @@ -550,72 +439,6 @@ Component }; }; -Section -{ - admin; - cli-mono; - comm; - database; - debian-installer; - debug; - devel; - doc; - editors; - embedded; - electronics; - fonts; - games; - gnome; - graphics; - gnu-r; - gnustep; - hamradio; - haskell; - httpd; - interpreters; - java; - kde; - kernel; - libdevel; - libs; - lisp; - localization; - mail; - math; - misc; - net; - news; - ocaml; - oldlibs; - otherosfs; - perl; - php; - python; - ruby; - science; - shells; - sound; - tex; - text; - utils; - web; - vcs; - video; - x11; - xfce; - zope; -}; - -Priority -{ - required 1; - important 2; - standard 3; - optional 4; - extra 5; - source 0; // i.e. unused -}; - OverrideType { deb; @@ -623,18 +446,6 @@ OverrideType dsc; }; -Location -{ - - // Pool locations on ftp-master.debian.org - /srv/ftp-master.debian.org/ftp/pool/ - { - Archive "ftp-master"; - Type "pool"; - }; - -}; - Urgency { Default "low"; @@ -659,3 +470,10 @@ Common // The default number of threads for multithreading parts of dak: ThreadCount 16; } + +Changelogs +{ + Testing "/srv/release.debian.org/tools/trille/current-testing"; + Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog"; + Export "/srv/ftp-master.debian.org/export/changelogs"; +}