X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=e326354ab6399a61a7c8a17425764f5892a7b7b9;hb=2bf397e00e25bd7b3a5378727ca4eab8ba14d84c;hp=858c1f7149ca7ace260f2eb04930f59ee6f04074;hpb=e39ac4bb9c19e58585b64fba058fb6218a24d9e3;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 858c1f71..e326354a 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,10 +20,7 @@ Dinstall OverrideDisparityCheck "true"; DefaultSuite "unstable"; LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; - Reject - { - 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 @@ -49,7 +41,7 @@ Generate-Index-Diffs Options { TempDir "/srv/ftp-master.debian.org/tiffani"; - MaxDiffs { Default 14; }; + MaxDiffs { Default 56; }; }; }; @@ -88,8 +80,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -104,19 +94,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"; @@ -167,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 @@ -260,14 +217,10 @@ 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"; @@ -275,13 +228,10 @@ SuiteMappings "map wheezy-proposed-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-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; @@ -321,11 +271,11 @@ 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/"; @@ -334,23 +284,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 @@ -372,16 +309,6 @@ DB Unicode "false" }; -Archive -{ - ftp-master - { - OriginServer "ftp-master.debian.org"; - PrimaryMirror "ftp.debian.org"; - Description "Master Archive for the Debian project"; - }; -}; - Urgency { Default "low"; @@ -418,8 +345,6 @@ Generate-Releases { MD5Sum { - oldstable; - oldstable-proposed-updates; proposed-updates; stable; squeeze-updates; @@ -430,8 +355,6 @@ Generate-Releases }; SHA1 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable; @@ -442,8 +365,6 @@ Generate-Releases }; SHA256 { - oldstable; - oldstable-proposed-updates; proposed-updates; squeeze-updates; stable;