X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=b254a7ad5ad8a4243887065934c5325a1efd991b;hb=383fcee18cb81cfdd2467bedd4b9eb3481a52f91;hp=e5a82864f49a4fe6203a5e32f83310192638d603;hpb=9f371390bb90395b2f2f0b65c91c21047896774a;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index e5a82864..b254a7ad 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,17 +1,16 @@ Dinstall { GPGKeyring { - "/usr/share/keyrings/debian-keyring.gpg"; - "/usr/share/keyrings/debian-keyring.pgp"; - "/usr/share/keyrings/debian-keyring.pgp"; -// "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg"; + "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; + "/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"; - SendmailCommand "/bin/echo -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 @@ -27,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; @@ -49,6 +48,7 @@ Dinstall Transitions { + Notifications "debian-devel@lists.debian.org"; TempPath "/srv/ftp.debian.org/tmp/"; }; @@ -95,7 +95,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 @@ -138,7 +138,7 @@ Import-Archive Import-Keyring { - /srv/ftp.debian.org/keyrings/debian-maintainers.gpg + /srv/keyring.debian.org/keyrings/debian-maintainers.gpg { Debian-Maintainer "true"; }; @@ -174,7 +174,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 @@ -209,22 +210,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - arm; - hppa; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-changes@lists.debian.org"; // Version "4.0r1"; Origin "Debian"; @@ -232,7 +217,6 @@ Suite CodeName "etch"; OverrideCodeName "etch"; Priority "5"; - Untouchable "1"; ChangeLogBase "dists/oldstable/"; UdebComponents { @@ -249,22 +233,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - arm; - hppa; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/oldstable-proposed-updates/"; CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/"; @@ -309,23 +277,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - arm; - armel; - hppa; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-changes@lists.debian.org"; // Version "5.0r0"; Origin "Debian"; @@ -333,7 +284,6 @@ Suite CodeName "lenny"; OverrideCodeName "lenny"; Priority "5"; - Untouchable "1"; ChangeLogBase "dists/stable/"; UdebComponents { @@ -350,23 +300,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - arm; - armel; - hppa; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/"; @@ -383,14 +316,15 @@ Suite { MustBeNewerThan { + OldStable; Stable; }; - MustBeOlderThan - { - Testing; - Unstable; - Experimental; - }; +// MustBeOlderThan +// { +// Testing; +// Unstable; +// Experimental; +// }; Enhances { Stable; @@ -411,22 +345,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - armel; - hppa; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution - Not Released"; @@ -449,22 +367,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - armel; - hppa; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; @@ -477,8 +379,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; }; MustBeOlderThan @@ -506,12 +409,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - m68k; - }; Announce "debian-testing-changes@lists.debian.org"; Origin "Debian"; Description "Debian Etch for m68k - Not Released"; @@ -533,23 +430,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - armel; - hppa; - hurd-i386; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-devel-changes@lists.debian.org"; Origin "Debian"; Description "Debian Unstable - Not Released"; @@ -561,8 +441,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; Testing-Proposed-Updates; }; @@ -582,23 +463,6 @@ Suite contrib; non-free; }; - Architectures - { - source; - all; - alpha; - amd64; - armel; - hppa; - hurd-i386; - i386; - ia64; - mips; - mipsel; - powerpc; - s390; - sparc; - }; Announce "debian-devel-changes@lists.debian.org"; Origin "Debian"; Description "Experimental packages - not released; use at your own risk."; @@ -612,8 +476,9 @@ Suite { MustBeNewerThan { + OldStable; Stable; - Proposed-Updates; +// Proposed-Updates; Testing; Testing-Proposed-Updates; Unstable; @@ -633,6 +498,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"; @@ -645,6 +515,7 @@ SuiteMappings "map testing-security testing-proposed-updates"; "map-unreleased testing unstable"; "map-unreleased testing-proposed-updates unstable"; + "reject etch-m68k"; }; AutomaticByHandPackages { @@ -655,13 +526,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"; @@ -702,7 +566,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/"; }; }; @@ -730,6 +598,7 @@ Architectures hppa "HP PA RISC"; amd64 "AMD64"; arm "ARM"; + armel "ARM eabi"; i386 "Intel ia32"; ia64 "Intel ia64"; m68k "Motorola Mc680x0"; @@ -737,8 +606,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 @@ -770,42 +640,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; @@ -813,7 +691,11 @@ Section text; utils; web; + vcs; + video; x11; + xfce; + zope; }; Priority @@ -858,7 +740,8 @@ Urgency }; }; -Content +Contents { - Header "contents" -} \ No newline at end of file + Header "contents"; + Root "/srv/ftp.debian.org/test/"; +}