X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=7c76d0ca60c2a07f12156a23790a678cfb0b7b9d;hb=04124dca8d87afbcde068a654462b62978a415e9;hp=de6841e9d26b32e1ef82361da6fc2cb9c95aa350;hpb=e0ef48cd237d4af31499adbb16606ce3d8b7ee4f;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index de6841e9..7c76d0ca 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -3,13 +3,14 @@ Dinstall GPGKeyring { "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; - "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg"; + "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"; }; SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "6070D3A1"; - SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; - MyEmailAddress "Debian Installer "; + 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 "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails @@ -25,7 +26,7 @@ Dinstall CloseBugs "true"; OverrideDisparityCheck "true"; DefaultSuite "unstable"; - UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; + LintianTags "/srv/ftp.debian.org/dak/config/debian/lintian.tags"; QueueBuildSuites { unstable; @@ -47,7 +48,7 @@ Dinstall Transitions { - TempPath "/srv/ftp.debian.org/tmp/"; + Notifications "debian-devel@lists.debian.org"; }; Generate-Index-Diffs @@ -93,7 +94,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"; + KnownPostgres "postgres,dak,katie,release,qa,www-data,guest"; }; Clean-Queues @@ -136,7 +137,7 @@ Import-Archive Import-Keyring { - /srv/ftp.debian.org/keyrings/debian-maintainers.gpg + /srv/keyring.debian.org/keyrings/debian-maintainers.gpg { Debian-Maintainer "true"; }; @@ -172,7 +173,8 @@ Clean-Suites Process-New { - AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock"; + DinstallLockFile "/srv/ftp.debian.org/lock/processnew.lock"; + LockDir "/srv/ftp.debian.org/lock/new/"; }; Check-Overrides @@ -199,74 +201,6 @@ Check-Overrides Suite { - OldStable - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - // Version "4.0r1"; - Origin "Debian"; - // Description "Debian 4.0r1 Released 15 August 2007"; - CodeName "etch"; - OverrideCodeName "etch"; - Priority "5"; - Untouchable "1"; - ChangeLogBase "dists/oldstable/"; - UdebComponents - { - main; - non-free; - }; - }; - - Oldstable-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/oldstable-proposed-updates/"; - CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/"; - CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/"; - Version "4.0-updates"; - Origin "Debian"; - Description "Debian 4.0 Proposed Updates - Not Released"; - CodeName "etch-proposed-updates"; - OverrideCodeName "etch"; - OverrideSuite "oldstable"; - ValidTime 604800; // 7 days - Priority "4"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - }; - MustBeOlderThan - { - Stable; - Testing; - Unstable; - Experimental; - }; - Enhances - { - OldStable; - }; - }; - UdebComponents - { - main; - }; - }; - Stable { Components @@ -282,7 +216,6 @@ Suite CodeName "lenny"; OverrideCodeName "lenny"; Priority "5"; - Untouchable "1"; ChangeLogBase "dists/stable/"; UdebComponents { @@ -315,14 +248,15 @@ Suite { MustBeNewerThan { + OldStable; Stable; }; - MustBeOlderThan - { - Testing; - Unstable; - Experimental; - }; +// MustBeOlderThan +// { +// Testing; +// Unstable; +// Experimental; +// }; Enhances { Stable; @@ -377,8 +311,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; }; MustBeOlderThan @@ -398,27 +333,6 @@ Suite }; }; - Etch-m68k - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Etch for m68k - Not Released"; - CodeName "etch-m68k"; - OverrideCodeName "etch"; - Priority "5"; - UdebComponents - { - main; - non-free; - }; - }; - Unstable { Components @@ -438,8 +352,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; Testing-Proposed-Updates; }; @@ -472,8 +387,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; Testing-Proposed-Updates; Unstable; @@ -490,15 +406,19 @@ Suite SuiteMappings { - "propup-version oldstable-security stable testing testing-proposed-updates unstable"; +// "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 oldstable oldstable-proposed-updates"; - "map oldstable-security oldstable-proposed-updates"; + "map lenny stable"; + "map squeeze testing"; + "map sid unstable"; + "map rc-buggy experimental"; +// "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"; @@ -515,13 +435,6 @@ AutomaticByHandPackages { Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di"; }; - "debian-maintainers" { - Source "debian-maintainers"; - Section "raw-keyring"; - Extension "gpg"; - Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-dm"; - }; - "tag-overrides" { Source "tag-overrides"; Section "byhand"; @@ -551,9 +464,9 @@ Dir Override "/srv/ftp.debian.org/scripts/override/"; QueueBuild "/srv/incoming.debian.org/buildd/"; UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; + TempPath "/srv/ftp.debian.org/tmp/"; Queue { - Accepted "/srv/ftp.debian.org/queue/accepted/"; Byhand "/srv/ftp.debian.org/queue/byhand/"; ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/"; OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/"; @@ -562,7 +475,11 @@ Dir New "/srv/ftp.debian.org/queue/new/"; Reject "/srv/ftp.debian.org/queue/reject/"; Unchecked "/srv/ftp.debian.org/queue/unchecked/"; + Newstage "/srv/ftp.debian.org/queue/newstage/"; BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/"; + Embargoed "/does/not/exist/"; + Unembargoed "/does/not/exist/"; + Disembargo "/does/not/exist/"; }; }; @@ -598,8 +515,9 @@ Architectures mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; s390 "IBM S/390"; - sh "Hitatchi SuperH"; sparc "Sun SPARC/UltraSPARC"; + kfreebsd-i386 "GNU/kFreeBSD i386"; + kfreebsd-amd64 "GNU/kFreeBSD amd64"; }; Archive @@ -636,31 +554,45 @@ Component Section { admin; - base; + 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; @@ -668,7 +600,11 @@ Section text; utils; web; + vcs; + video; x11; + xfce; + zope; }; Priority @@ -716,4 +652,5 @@ Urgency Contents { Header "contents"; -} \ No newline at end of file + Root "/srv/ftp.debian.org/test/"; +}