X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=8b1b43220b4b9600a15f352462defbb94f4fc328;hb=9e68d19cf842cd942e03c37ecb3228730585ebc8;hp=718bdc248fe1a246e39e786da143b980264d76ce;hpb=2dbc6c7983dbbe935e0f4c2147448dae7d41b6c5;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 718bdc24..8b1b4322 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,15 +1,10 @@ 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 "Archive Administrator "; + MyEmailAddress "Debian FTP Masters "; MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails @@ -26,13 +21,8 @@ Dinstall OverrideDisparityCheck "true"; DefaultSuite "unstable"; LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; - QueueBuildSuites - { - unstable; - }; 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 @@ -59,11 +49,6 @@ Generate-Index-Diffs }; }; -Override -{ - MyEmailAddress "Debian FTP Masters "; -}; - Show-New { HTMLPath "/srv/ftp.debian.org/web/new/"; @@ -79,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 @@ -99,8 +84,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -110,32 +93,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"; - }; -}; - -Reject-Proposed-Updates -{ - StableRejector "the Stable Release Team"; - StableMail "debian-release@lists.debian.org"; - MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/"; -}; - Import-LDAP-Fingerprints { LDAPDn "ou=users,dc=debian,dc=org"; @@ -153,7 +115,6 @@ Clean-Suites { // How long (in seconds) dead packages are left before being killed StayOfExecution 129600; // 1.5 days - QueueBuildStayOfExecution 86400; // 24 hours MorgueSubDir "pool"; }; @@ -187,6 +148,16 @@ Check-Overrides Suite { + OldStable + { + Components + { + main; + contrib; + non-free; + }; + }; + Stable { Components @@ -195,10 +166,9 @@ Suite contrib; non-free; }; - ChangeLogBase "dists/stable/"; }; - Proposed-Updates + OldStable-Proposed-Updates { Components { @@ -206,28 +176,15 @@ Suite contrib; non-free; }; - CopyChanges "dists/proposed-updates/"; - CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/"; - CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - VersionChecks + }; + + Proposed-Updates + { + Components { - MustBeNewerThan - { - OldStable; - Stable; - }; -// MustBeOlderThan -// { -// Testing; -// Unstable; -// Experimental; -// }; - Enhances - { - Stable; - }; + main; + contrib; + non-free; }; }; @@ -239,7 +196,6 @@ Suite contrib; non-free; }; - ValidTime 604800; // 7 days }; Testing-Proposed-Updates @@ -250,30 +206,9 @@ Suite contrib; non-free; }; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - Enhances - { - Testing; - }; - }; }; - Squeeze-Volatile + Squeeze-Updates { Components { @@ -281,21 +216,6 @@ Suite contrib; non-free; }; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - }; Unstable @@ -306,18 +226,6 @@ Suite contrib; non-free; }; - ValidTime 604800; // 7 days - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - }; - }; }; Experimental @@ -328,39 +236,33 @@ Suite contrib; non-free; }; - OverrideSuite "unstable"; - ValidTime 604800; // 7 days - 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"; @@ -390,6 +292,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 @@ -397,15 +305,14 @@ 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/"; - QueueBuild "/srv/incoming.debian.org/buildd/"; UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; TempPath "/srv/ftp-master.debian.org/tmp/"; Queue @@ -421,9 +328,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/"; }; }; @@ -437,146 +344,13 @@ Queue-Report DB { - Name "projectb"; - Host ""; - Port 5433; -}; - -Architectures -{ - source "Source"; - all "Architecture Independent"; - alpha "DEC Alpha"; - hurd-i386 "Intel ia32 running the HURD"; - hppa "HP PA RISC"; - amd64 "AMD64"; - arm "ARM"; - armel "ARM eabi"; - i386 "Intel ia32"; - ia64 "Intel ia64"; - mips "MIPS (Big Endian)"; - mipsel "MIPS (Little Endian)"; - powerpc "PowerPC"; - s390 "IBM S/390"; - sparc "Sun SPARC/UltraSPARC"; - kfreebsd-i386 "GNU/kFreeBSD i386"; - kfreebsd-amd64 "GNU/kFreeBSD amd64"; -}; - -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"; - }; -}; - -Section -{ - admin; - cli-mono; - comm; - database; - debian-installer; - debug; - devel; - doc; - editors; - embedded; - electronics; - fonts; - games; - gnome; - graphics; - gnu-r; - gnustep; - hamradio; - haskell; - httpd; - interpreters; - java; - kde; - kernel; - libdevel; - libs; - lisp; - localization; - mail; - math; - misc; - net; - news; - ocaml; - oldlibs; - otherosfs; - perl; - php; - python; - ruby; - science; - shells; - sound; - tex; - text; - utils; - web; - vcs; - video; - x11; - xfce; - zope; -}; - -Priority -{ - required 1; - important 2; - standard 3; - optional 4; - extra 5; - source 0; // i.e. unused -}; - -OverrideType -{ - deb; - udeb; - dsc; -}; - -Location -{ - - // Pool locations on ftp-master.debian.org - /srv/ftp-master.debian.org/ftp/pool/ - { - Archive "ftp-master"; - Type "pool"; - }; - + 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 @@ -610,3 +384,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; + }; +}