X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=2f2ddc8e810c82d43437cad2f37089ebd2c5356d;hb=d35087b834bb783a7d4b4003885049979e42f3bb;hp=2741eed7852a16562c4714b27fca803e9854a543;hpb=6cb0b0401eaeeb6900551c20617f0a8f2293cd89;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 2741eed7..2f2ddc8e 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -27,7 +27,6 @@ Dinstall LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; Reject { - NoSourceOnly "true"; 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 @@ -69,7 +68,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"; + KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser"; }; Clean-Queues @@ -89,8 +88,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -105,19 +102,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"; @@ -196,17 +180,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - }; - Enhances - { - OldStable; - }; - }; }; Proposed-Updates @@ -217,24 +190,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; - }; -// MustBeOlderThan -// { -// Testing; -// Unstable; -// Experimental; -// }; - Enhances - { - Stable; - }; - }; }; Testing @@ -255,25 +210,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - Enhances - { - Testing; - }; - }; }; Squeeze-Updates @@ -284,25 +220,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - MustBeOlderThan - { - Testing; - Testing-Proposed-Updates; - Unstable; - Experimental; - }; - Enhances - { - Stable; - }; - }; - }; Unstable @@ -313,17 +230,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - }; - }; }; Experimental @@ -334,30 +240,24 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - Unstable; - }; - }; }; - }; 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 sid unstable"; "map rc-buggy experimental"; "map oldstable oldstable-proposed-updates"; @@ -365,6 +265,7 @@ SuiteMappings "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"; @@ -415,7 +316,6 @@ Dir Log "/srv/ftp-master.debian.org/log/"; Lock "/srv/ftp-master.debian.org/lock"; Morgue "/srv/ftp-master.debian.org/morgue/"; - MorgueReject "reject"; Override "/srv/ftp-master.debian.org/scripts/override/"; UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; TempPath "/srv/ftp-master.debian.org/tmp/"; @@ -432,9 +332,9 @@ Dir 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 "/does/not/exist/"; - Unembargoed "/does/not/exist/"; - Disembargo "/does/not/exist/"; + 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/"; }; }; @@ -448,9 +348,13 @@ Queue-Report DB { - Name "projectb"; - Host ""; - Port 5433; + Service "projectb"; + // PoolSize should be at least ThreadCount + 1 + PoolSize 5; + // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize + MaxOverflow 13; + // should be false for encoding == SQL_ASCII + Unicode "false" }; Archive @@ -463,34 +367,6 @@ Archive }; }; -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"; @@ -522,3 +398,43 @@ Changelogs Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog"; Export "/srv/ftp-master.debian.org/export/changelogs"; } + +Generate-Releases +{ + MD5Sum + { + oldstable; + oldstable-proposed-updates; + proposed-updates; + stable; + squeeze-updates; + testing; + testing-proposed-updates; + unstable; + experimental; + }; + SHA1 + { + oldstable; + oldstable-proposed-updates; + proposed-updates; + squeeze-updates; + stable; + testing; + testing-proposed-updates; + unstable; + experimental; + }; + SHA256 + { + oldstable; + oldstable-proposed-updates; + proposed-updates; + squeeze-updates; + stable; + testing; + testing-proposed-updates; + unstable; + experimental; + }; +}