X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=c06cd67478ca82f425fefbccf8df7216e62c433d;hb=91b516fcb3c1d1e9e591d95bff213a0554c54946;hp=24f662e113b25b818ccda92016acd193fe42fdee;hpb=efe39a90214db10e0a993a2aa2d236edcae46016;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 24f662e1..c06cd674 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -5,16 +5,13 @@ Dinstall // 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 "Debian FTP Masters "; - MyAdminAddress "ftpmaster@debian.org"; + MyAdminAddress "ftpmaster@ftp-master.debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails BugServer "bugs.debian.org"; PackagesServer "packages.debian.org"; TrackingServer "packages.qa.debian.org"; - LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock"; Bcc "archive@ftp-master.debian.org"; - FutureTimeTravelGrace 28800; // 8 hours - PastCutoffYear "1984"; SkipTime 300; BXANotify "true"; CloseBugs "true"; @@ -42,13 +39,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 @@ -61,7 +59,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 @@ -117,7 +115,6 @@ Clean-Suites Process-New { - DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock"; LockDir "/srv/ftp-master.debian.org/lock/new/"; }; @@ -145,34 +142,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 @@ -238,28 +215,30 @@ 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"; + "silent-map squeeze-security oldstable-security"; + "silent-map wheezy-security stable-security"; + "silent-map jessie-security testing-security"; "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 squeeze oldstable"; + "map squeeze-proposed-updates oldstable-proposed-updates"; + "map squeeze-updates oldstable-proposed-updates"; + "map wheezy stable"; + "map wheezy-proposed-updates proposed-updates"; + "map wheezy-updates proposed-updates"; + "map jessie testing"; + "map jessie-proposed-updates testing-proposed-updates"; + "map jessie-updates testing-proposed-updates"; "map sid unstable"; "map rc-buggy experimental"; "map oldstable oldstable-proposed-updates"; "map oldstable-security oldstable-proposed-updates"; + "map oldstable-updates 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"; @@ -269,6 +248,13 @@ SuiteMappings }; AutomaticByHandPackages { + "debian-faq" { + Source "debian-faq"; + Section "byhand"; + Extension "gz"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-debian-faq"; + }; + "debian-installer-images" { Source "debian-installer"; Section "raw-installer"; @@ -299,10 +285,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/"; @@ -314,21 +300,7 @@ Dir BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/"; Holding "/srv/ftp-master.debian.org/queue/holding/"; Done "/srv/ftp-master.debian.org/queue/done/"; - - Queue - { - Byhand "/srv/ftp-master.debian.org/queue/byhand/"; - ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; - OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/"; - ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/"; - New "/srv/ftp-master.debian.org/queue/new/"; - Reject "/srv/ftp-master.debian.org/queue/reject/"; - Unchecked "/srv/ftp-master.debian.org/queue/unchecked/"; - Newstage "/srv/ftp-master.debian.org/queue/newstage/"; - 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/"; - }; + Reject "/srv/ftp-master.debian.org/queue/reject/"; }; Queue-Report @@ -386,8 +358,6 @@ Generate-Releases { MD5Sum { - oldstable; - oldstable-proposed-updates; proposed-updates; stable; squeeze-updates; @@ -398,8 +368,6 @@ Generate-Releases }; SHA1 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable; @@ -410,8 +378,6 @@ Generate-Releases }; SHA256 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable; @@ -421,3 +387,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 + }; +};