X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=6dddf2298a5a5f1e40c59b98331015650455e78c;hb=d2abaeb402e4fd4ecf397c2fbe327abfd135180b;hp=34fd434fc496aa6605af76e962cf922e3b9fc385;hpb=b2722f84afb0d994ed6aa11f5a969445b6e6be4d;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 34fd434f..6dddf229 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,11 +54,6 @@ Generate-Index-Diffs }; }; -Override -{ - MyEmailAddress "Debian FTP Masters "; -}; - Show-New { HTMLPath "/srv/ftp.debian.org/web/new/"; @@ -79,7 +69,7 @@ Import-Users-From-Passwd { ValidGID "800"; // Comma separated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,dak,katie,release,qa,www-data,guest"; + KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser"; }; Clean-Queues @@ -110,7 +100,6 @@ 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"; @@ -129,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"; @@ -153,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"; }; @@ -187,6 +168,16 @@ Check-Overrides Suite { + OldStable + { + Components + { + main; + contrib; + non-free; + }; + }; + Stable { Components @@ -195,11 +186,27 @@ Suite contrib; non-free; }; - // Description "Debian 5.0r0 Released 14 February 2009"; - CodeName "lenny"; - OverrideCodeName "lenny"; - Priority "5"; - ChangeLogBase "dists/stable/"; + }; + + OldStable-Proposed-Updates + { + Components + { + main; + contrib; + non-free; + }; + VersionChecks + { + MustBeNewerThan + { + OldStable; + }; + Enhances + { + OldStable; + }; + }; }; Proposed-Updates @@ -210,15 +217,6 @@ Suite contrib; non-free; }; - CopyChanges "dists/proposed-updates/"; - CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/"; - CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/"; - Description "Debian 5.0 Proposed Updates - Not Released"; - CodeName "lenny-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - Priority "4"; VersionChecks { MustBeNewerThan @@ -247,11 +245,6 @@ Suite contrib; non-free; }; - Description "Debian Testing distribution - Not Released"; - CodeName "squeeze"; - OverrideCodeName "squeeze"; - ValidTime 604800; // 7 days - Priority "5"; }; Testing-Proposed-Updates @@ -262,12 +255,6 @@ Suite contrib; non-free; }; - Description "Debian Testing distribution updates - Not Released"; - CodeName "squeeze-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - Priority "6"; VersionChecks { MustBeNewerThan @@ -289,7 +276,7 @@ Suite }; }; - Squeeze-Volatile + Squeeze-Updates { Components { @@ -297,23 +284,22 @@ Suite contrib; non-free; }; - Description "Volatile Packages for Debian x.y (testing)"; - CodeName "squeeze-volatile"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; VersionChecks { MustBeNewerThan { Stable; - Testing; }; + MustBeOlderThan + { + Testing; + Testing-Proposed-Updates; + Unstable; + Experimental; + }; Enhances { - Testing; + Stable; }; }; @@ -327,11 +313,6 @@ Suite contrib; non-free; }; - Description "Debian Unstable - Not Released"; - CodeName "sid"; - OverrideCodeName "sid"; - ValidTime 604800; // 7 days - Priority "7"; VersionChecks { MustBeNewerThan @@ -353,13 +334,6 @@ Suite contrib; non-free; }; - 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 @@ -378,19 +352,23 @@ Suite SuiteMappings { -// "propup-version oldstable-security stable testing testing-proposed-updates unstable"; + "silent-map lenny-security oldstable-security"; + "silent-map squeeze-security stable-security"; + "silent-map wheezy-security testing-security"; + "propup-version oldstable-security stable testing testing-proposed-updates unstable"; "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; - "map lenny stable"; - "map squeeze testing"; + "map lenny oldstable"; + "map squeeze stable"; + "map wheezy testing"; "map sid unstable"; "map rc-buggy experimental"; -// "map oldstable oldstable-proposed-updates"; -// "map oldstable-security oldstable-proposed-updates"; + "map oldstable oldstable-proposed-updates"; + "map oldstable-security oldstable-proposed-updates"; "map stable proposed-updates"; "map stable-security proposed-updates"; "map stable-proposed-updates proposed-updates"; -// "map-unreleased oldstable unstable"; + "map-unreleased oldstable unstable"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; @@ -420,6 +398,12 @@ AutomaticByHandPackages { Extension "tar.gz"; Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task"; }; + + "win32-loader" { + Source "win32-loader"; + Section "byhand"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-win32-loader"; + }; }; Dir @@ -427,6 +411,7 @@ Dir Root "/srv/ftp-master.debian.org/ftp/"; Pool "/srv/ftp-master.debian.org/ftp/pool/"; Templates "/srv/ftp-master.debian.org/dak/templates/"; + Export "/srv/ftp-master.debian.org/export/"; PoolRoot "pool/"; Lists "/srv/ftp-master.debian.org/database/dists/"; Cache "/srv/ftp-master.debian.org/database/"; @@ -435,7 +420,6 @@ Dir 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 @@ -451,9 +435,9 @@ Dir Unchecked "/srv/ftp-master.debian.org/queue/unchecked/"; Newstage "/srv/ftp-master.debian.org/queue/newstage/"; BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/"; - Embargoed "/does/not/exist/"; - Unembargoed "/does/not/exist/"; - Disembargo "/does/not/exist/"; + Embargoed "/srv/ftp-master.debian.org/does/not/exist/"; + Unembargoed "/srv/ftp-master.debian.org/does/not/exist/"; + Disembargo "/srv/ftp-master.debian.org/does/not/exist/"; }; }; @@ -467,30 +451,13 @@ Queue-Report DB { - Name "projectb"; - Host ""; - 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"; - 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"; + Service "projectb"; + // PoolSize should be at least ThreadCount + 1 + PoolSize 5; + // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize + MaxOverflow 13; + // should be false for encoding == SQL_ASCII + Unicode "false" }; Archive @@ -524,72 +491,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; @@ -597,18 +498,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"; @@ -640,3 +529,43 @@ Changelogs Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog"; Export "/srv/ftp-master.debian.org/export/changelogs"; } + +Generate-Releases +{ + MD5Sum + { + oldstable; + oldstable-proposed-updates; + proposed-updates; + stable; + squeeze-updates; + testing; + testing-proposed-updates; + unstable; + experimental; + }; + SHA1 + { + oldstable; + oldstable-proposed-updates; + proposed-updates; + squeeze-updates; + stable; + testing; + testing-proposed-updates; + unstable; + experimental; + }; + SHA256 + { + oldstable; + oldstable-proposed-updates; + proposed-updates; + squeeze-updates; + stable; + testing; + testing-proposed-updates; + unstable; + experimental; + }; +}