X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=7c5d57f686f93f6ac0f1ecaa1c26b2735a2a1888;hb=e13fd3c48245d48b0335649d294aacaee666bab5;hp=06b6f05f7118c8102160f8eb9e9c233af481b3cb;hpb=2541a35644a2cb51de6d7d286b6f8a40d01e50f1;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 06b6f05f..7c5d57f6 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,12 +1,7 @@ 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"; - SigningKeyIds "55BE302B"; // 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 "; @@ -16,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"; @@ -26,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 @@ -51,7 +41,7 @@ Generate-Index-Diffs Options { TempDir "/srv/ftp-master.debian.org/tiffani"; - MaxDiffs { Default 14; }; + MaxDiffs { Default 56; }; }; }; @@ -70,7 +60,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 @@ -90,8 +80,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -101,25 +89,11 @@ Rm Suite "unstable"; }; - MyEmailAddress "Debian Archive Maintenance "; LogFile "/srv/ftp.debian.org/web/removals.txt"; LogFile822 "/srv/ftp.debian.org/web/removals.822"; 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"; @@ -170,6 +144,16 @@ Check-Overrides Suite { + OldStable + { + Components + { + main; + contrib; + non-free; + }; + }; + Stable { Components @@ -180,7 +164,7 @@ Suite }; }; - Proposed-Updates + OldStable-Proposed-Updates { Components { @@ -188,23 +172,15 @@ Suite contrib; non-free; }; - VersionChecks + }; + + Proposed-Updates + { + Components { - MustBeNewerThan - { - OldStable; - Stable; - }; -// MustBeOlderThan -// { -// Testing; -// Unstable; -// Experimental; -// }; - Enhances - { - Stable; - }; + main; + contrib; + non-free; }; }; @@ -226,28 +202,9 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - Enhances - { - Testing; - }; - }; }; - Squeeze-Volatile + Squeeze-Updates { Components { @@ -255,19 +212,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - }; Unstable @@ -278,17 +222,6 @@ Suite contrib; non-free; }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - }; - }; }; Experimental @@ -299,37 +232,30 @@ 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 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 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"; @@ -359,6 +285,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 @@ -366,33 +298,19 @@ Dir Root "/srv/ftp-master.debian.org/ftp/"; Pool "/srv/ftp-master.debian.org/ftp/pool/"; Templates "/srv/ftp-master.debian.org/dak/templates/"; - PoolRoot "pool/"; + 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/"; 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/"; - 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 "/does/not/exist/"; - Unembargoed "/does/not/exist/"; - Disembargo "/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 @@ -405,47 +323,13 @@ Queue-Report DB { - Name "projectb"; - Host ""; - Port 5433; -}; - -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; + 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" }; Urgency @@ -479,3 +363,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; + }; +}