X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=acb2ac0088fffccd3ed418feee7bc5c382d53c87;hb=201f4fe6b98a5c7bae22b66110c952ea2e593ef5;hp=3cd6705bdbf25da0a9aaeea5007f0e99d4e29eac;hpb=dbf5091efbd9d2b7e7527e48343b43b10d820970;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 3cd6705b..acb2ac00 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,15 +1,15 @@ Dinstall { GPGKeyring { - "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + "/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"; + 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 +25,6 @@ Dinstall CloseBugs "true"; OverrideDisparityCheck "true"; DefaultSuite "unstable"; - UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; QueueBuildSuites { unstable; @@ -47,6 +46,7 @@ Dinstall Transitions { + Notifications "debian-devel@lists.debian.org"; TempPath "/srv/ftp.debian.org/tmp/"; }; @@ -93,7 +93,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 +136,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 +172,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 @@ -214,7 +215,6 @@ Suite CodeName "etch"; OverrideCodeName "etch"; Priority "5"; - Untouchable "1"; ChangeLogBase "dists/oldstable/"; UdebComponents { @@ -282,7 +282,6 @@ Suite CodeName "lenny"; OverrideCodeName "lenny"; Priority "5"; - Untouchable "1"; ChangeLogBase "dists/stable/"; UdebComponents { @@ -315,14 +314,15 @@ Suite { MustBeNewerThan { + OldStable; Stable; }; - MustBeOlderThan - { - Testing; - Unstable; - Experimental; - }; +// MustBeOlderThan +// { +// Testing; +// Unstable; +// Experimental; +// }; Enhances { Stable; @@ -377,8 +377,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; }; MustBeOlderThan @@ -438,8 +439,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; Testing-Proposed-Updates; }; @@ -472,8 +474,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; Testing-Proposed-Updates; Unstable; @@ -493,6 +496,11 @@ SuiteMappings "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 etch oldstable"; + "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"; @@ -505,6 +513,7 @@ SuiteMappings "map testing-security testing-proposed-updates"; "map-unreleased testing unstable"; "map-unreleased testing-proposed-updates unstable"; + "reject etch-m68k"; }; AutomaticByHandPackages { @@ -515,13 +524,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"; @@ -562,7 +564,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 +604,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 @@ -631,42 +638,50 @@ Component Description "Software that fails to meet the DFSG"; MeetsDFSG "false"; }; - - mixed // **NB:** only used for overrides; not yet used in other code - { - Description "Legacy Mixed"; - MeetsDFSG "false"; - }; }; 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; @@ -674,7 +689,11 @@ Section text; utils; web; + vcs; + video; x11; + xfce; + zope; }; Priority @@ -718,3 +737,9 @@ Urgency critical; }; }; + +Contents +{ + Header "contents"; + Root "/srv/ftp.debian.org/test/"; +}