X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=fc0ec404969de84bcd9788a54f3ae2609a953dc6;hb=fcfcdcc15785c01785b18fecc903b3aef2b367f6;hp=503659aca88bd2199287b40f593b477aa1e8bb13;hpb=ebbb5c16d0a0ea9350bf1c139c8265dc2f470b6a;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 503659ac..fc0ec404 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -41,13 +41,14 @@ Generate-Index-Diffs Options { TempDir "/srv/ftp-master.debian.org/tiffani"; - MaxDiffs { Default 14; }; + MaxDiffs { Default 56; }; }; }; Show-New { HTMLPath "/srv/ftp.debian.org/web/new/"; + Options::Queue "new,backports-new"; } Show-Deferred @@ -60,7 +61,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,repuser"; + KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser"; }; Clean-Queues @@ -116,7 +117,6 @@ Clean-Suites Process-New { - DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock"; LockDir "/srv/ftp-master.debian.org/lock/new/"; }; @@ -144,34 +144,14 @@ Check-Overrides Suite { - OldStable - { - Components - { - main; - contrib; - non-free; - }; - }; - Stable { - Components - { - main; - contrib; - non-free; - }; - }; - - OldStable-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; + Components + { + main; + contrib; + non-free; + }; }; Proposed-Updates @@ -237,28 +217,23 @@ Suite SuiteMappings { - "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 oldstable"; - "map lenny-proposed-updates oldstable-proposed-updates"; "map squeeze stable"; "map squeeze-proposed-updates proposed-updates"; "map squeeze-updates proposed-updates"; "map wheezy testing"; "map wheezy-proposed-updates testing-proposed-updates"; + "map wheezy-updates testing-proposed-updates"; "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 stable-updates proposed-updates"; - "map-unreleased oldstable unstable"; + "map testing-updates testing-proposed-updates"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; @@ -298,10 +273,10 @@ AutomaticByHandPackages { Dir { + Base "/srv/ftp-master.debian.org/"; 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/"; Lists "/srv/ftp-master.debian.org/database/dists/"; Cache "/srv/ftp-master.debian.org/database/"; Log "/srv/ftp-master.debian.org/log/"; @@ -371,8 +346,6 @@ Generate-Releases { MD5Sum { - oldstable; - oldstable-proposed-updates; proposed-updates; stable; squeeze-updates; @@ -383,8 +356,6 @@ Generate-Releases }; SHA1 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable; @@ -395,8 +366,6 @@ Generate-Releases }; SHA256 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable; @@ -406,3 +375,30 @@ Generate-Releases experimental; }; } + +ByGroup { + dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak"; + ftpteam ""; + backports "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-backports"; +}; + +Command::DM { + ACL "dm"; + AdminKeyrings { + "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + }; + Keyrings { + "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"; + }; +}; + +Command::DM-Admin { + AdminFingerprints { + "AB41C1C68AFD668CA045EBF8673A03E4C1DB921F"; // gwolf + "0E3A94C3E83002DAB88CCA1694FA372B2DA8B985"; // noodles + + "80E976F14A508A48E9CA3FE9BC372252CA1CF964"; // ansgar + "FBFABDB541B5DC955BD9BA6EDB16CF5BB12525C4"; // joerg + "309911BEA966D0613053045711B4E5FF15B0FD82"; // mhy + }; +};