X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=c4bca87f4a95f28d6290f46197ccd9c5c18cfff1;hb=695759e80feca4d6b2c27143a076d5e2ddf90339;hp=f5424dcca280d65b0b0cc83c86b6a56fff9251bb;hpb=70f6c4de94c2d2e1bb76e165a2f15aaf0184215c;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index f5424dcc..c4bca87f 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,9 +1,5 @@ Dinstall { - GPGKeyring { - "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"; - }; SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; // SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org"; @@ -15,7 +11,6 @@ Dinstall 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"; @@ -25,11 +20,7 @@ Dinstall OverrideDisparityCheck "true"; DefaultSuite "unstable"; LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; - Reject - { - NoSourceOnly "true"; - ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml"; - }; + ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml"; // if you setup an own dak repository and want to upload Debian packages you most possibly want // to set the following option to a real path/filename and then enter those mail addresses that // you want to be able to receive mails generated by your dak installation. This avoids spamming @@ -50,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 @@ -69,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 @@ -89,8 +81,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -105,19 +95,6 @@ Rm Bcc "removed-packages@qa.debian.org"; }; -Import-Archive -{ - ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/"; -}; - -Import-Keyring -{ - /srv/keyring.debian.org/keyrings/debian-maintainers.gpg - { - Debian-Maintainer "true"; - }; -}; - Import-LDAP-Fingerprints { LDAPDn "ou=users,dc=debian,dc=org"; @@ -140,7 +117,6 @@ Clean-Suites Process-New { - DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock"; LockDir "/srv/ftp-master.debian.org/lock/new/"; }; @@ -168,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 @@ -261,28 +217,27 @@ 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 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"; @@ -322,11 +277,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/"; - PoolRoot "pool/"; Lists "/srv/ftp-master.debian.org/database/dists/"; Cache "/srv/ftp-master.debian.org/database/"; Log "/srv/ftp-master.debian.org/log/"; @@ -335,23 +289,10 @@ Dir Override "/srv/ftp-master.debian.org/scripts/override/"; UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; TempPath "/srv/ftp-master.debian.org/tmp/"; - 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/"; - Done "/srv/ftp-master.debian.org/queue/done/"; - Holding "/srv/ftp-master.debian.org/queue/holding/"; - 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/"; - BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/"; - 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/"; - }; + 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/"; + Reject "/srv/ftp-master.debian.org/queue/reject/"; }; Queue-Report @@ -373,44 +314,6 @@ DB Unicode "false" }; -Archive -{ - ftp-master - { - OriginServer "ftp-master.debian.org"; - PrimaryMirror "ftp.debian.org"; - Description "Master Archive for the Debian project"; - }; -}; - -Component -{ - main - { - Description "Main"; - MeetsDFSG "true"; - }; - - contrib - { - Description "Contrib"; - MeetsDFSG "true"; - }; - - non-free - { - Description "Software that fails to meet the DFSG"; - MeetsDFSG "false"; - }; -}; - -OverrideType -{ - deb; - udeb; - dsc; -}; - Urgency { Default "low"; @@ -447,8 +350,6 @@ Generate-Releases { MD5Sum { - oldstable; - oldstable-proposed-updates; proposed-updates; stable; squeeze-updates; @@ -459,8 +360,6 @@ Generate-Releases }; SHA1 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable; @@ -471,8 +370,6 @@ Generate-Releases }; SHA256 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable; @@ -482,3 +379,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 + }; +};