X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=6b5e17a9db52dc157b4f063d76b55333775e3099;hb=61eb4e708c28e6ee5ffa8b7fbbd6c3e0ad4887fc;hp=03444045ea3749a1042a3f8921fcf0cfe6220e39;hpb=3675b979c31f71967abd5d947c4122f62cc8941a;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 03444045..6b5e17a9 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"; @@ -27,7 +23,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 +64,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 +84,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -168,6 +161,16 @@ Check-Overrides Suite { + OldStable + { + Components + { + main; + contrib; + non-free; + }; + }; + Stable { Components @@ -178,7 +181,7 @@ Suite }; }; - Proposed-Updates + OldStable-Proposed-Updates { Components { @@ -186,23 +189,15 @@ Suite contrib; non-free; }; - VersionChecks + }; + + Proposed-Updates + { + Components { - MustBeNewerThan - { - OldStable; - Stable; - }; -// MustBeOlderThan -// { -// Testing; -// Unstable; -// Experimental; -// }; - Enhances - { - Stable; - }; + main; + contrib; + non-free; }; }; @@ -224,28 +219,9 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - Enhances - { - Testing; - }; - }; }; - Squeeze-Volatile + Squeeze-Updates { Components { @@ -253,19 +229,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - }; Unstable @@ -276,17 +239,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - }; - }; }; Experimental @@ -297,37 +249,33 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - Unstable; - }; - }; }; - }; SuiteMappings { -// "propup-version oldstable-security stable testing testing-proposed-updates unstable"; + "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 stable"; - "map squeeze testing"; + "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"; -// "map oldstable-security oldstable-proposed-updates"; + "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-unreleased oldstable unstable"; + "map stable-updates proposed-updates"; + "map-unreleased oldstable unstable"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; @@ -357,6 +305,12 @@ AutomaticByHandPackages { Extension "tar.gz"; Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task"; }; + + "win32-loader" { + Source "win32-loader"; + Section "byhand"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-win32-loader"; + }; }; Dir @@ -364,13 +318,13 @@ Dir 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/"; 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/"; @@ -387,9 +341,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/"; }; }; @@ -403,9 +357,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 @@ -418,34 +376,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"; @@ -470,3 +400,50 @@ Common // The default number of threads for multithreading parts of dak: ThreadCount 16; } + +Changelogs +{ + Testing "/srv/release.debian.org/tools/trille/current-testing"; + 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; + }; +}