X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=b888a6062eee558fb299894644109df97124030e;hb=356f4f93a9d0b29c0878111f7c3eee194f6571e5;hp=2e1eb3bbd227df52224c53c1b6a1069520a4bf67;hpb=317c4c7f173540de71907f1e527437d88f48a3b9;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 2e1eb3bb..d5858da3 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,40 +1,25 @@ 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 "; - MyAdminAddress "ftpmaster@debian.org"; + MyEmailAddress "Debian FTP Masters "; + MyAdminAddress "ftpmaster@ftp-master.debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() MyDistribution "Debian"; // Used in emails 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"; SkipTime 300; BXANotify "true"; CloseBugs "true"; 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"; - }; + ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml"; + AllowSourceOnlyUploads true; // 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 @@ -54,46 +39,29 @@ Generate-Index-Diffs { Options { + Archive "ftp-master"; TempDir "/srv/ftp-master.debian.org/tiffani"; - MaxDiffs { Default 14; }; + MaxDiffs { Default 56; }; }; }; -Override -{ - MyEmailAddress "Debian FTP Masters "; -}; - -Mirror-Split -{ - FTPPath "/srv/ftp-master.debian.org/ftp"; - TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots"; - TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs"; - BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; }; - CombinationTrees - { - popular { i386; powerpc; all; source; }; - source { source; }; - everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; }; - }; -}; - Show-New { HTMLPath "/srv/ftp.debian.org/web/new/"; + Options::Queue "new,backports-new"; } Show-Deferred { LinkPath "/srv/ftp.debian.org/web/deferred/"; - DeferredQueue "/srv/queued/DEFERRED/"; + DeferredQueue "/srv/upload.debian.org/DEFERRED/"; } Import-Users-From-Passwd { - ValidGID "800"; + ValidGID "Debian"; // 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,dak-unpriv,katie,release,qa,www-data,guest,repuser,debian-backup"; }; Clean-Queues @@ -113,8 +81,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -124,35 +90,16 @@ 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"; LDAPServer "db.debian.org"; + CACertFile "/etc/ssl/ca-debian/ca-certificates.crt"; ExtraKeyrings { "/srv/keyring.debian.org/keyrings/removed-keys.pgp"; @@ -164,395 +111,73 @@ Import-LDAP-Fingerprints Clean-Suites { - // How long (in seconds) dead packages are left before being killed - StayOfExecution 129600; // 1.5 days - QueueBuildStayOfExecution 86400; // 24 hours MorgueSubDir "pool"; }; Process-New { - DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock"; LockDir "/srv/ftp-master.debian.org/lock/new/"; }; -Check-Overrides -{ - OverrideSuites - { - Stable - { - Process "0"; - }; - - Testing - { - Process "1"; - OriginSuite "Unstable"; - }; - - Unstable - { - Process "1"; - }; - }; -}; - -Suite -{ - Stable - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - // Version "5.0r0"; - Origin "Debian"; - // Description "Debian 5.0r0 Released 14 February 2009"; - CodeName "lenny"; - OverrideCodeName "lenny"; - Priority "5"; - ChangeLogBase "dists/stable/"; - UdebComponents - { - main; - non-free; - }; - }; - - Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/proposed-updates/"; - CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/"; - CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/"; - Version "5.0-updates"; - Origin "Debian"; - Description "Debian 5.0 Proposed Updates - Not Released"; - CodeName "lenny-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - Priority "4"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; - }; -// MustBeOlderThan -// { -// Testing; -// Unstable; -// Experimental; -// }; - Enhances - { - Stable; - }; - }; - UdebComponents - { - main; - non-free; - }; - }; - - Lenny-Volatile - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; - - }; - - Lenny-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian 5.0"; - CodeName "lenny-volatile-proposed-updates"; - OverrideCodeName "lenny"; - OverrideSuite "stable"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - Enhances - { - Stable; - }; - }; - }; - - Testing - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Testing distribution - Not Released"; - CodeName "squeeze"; - OverrideCodeName "squeeze"; - ValidTime 604800; // 7 days - Priority "5"; - UdebComponents - { - main; - non-free; - }; - }; - - Testing-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Testing distribution updates - Not Released"; - CodeName "squeeze-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - Priority "6"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - Enhances - { - Testing; - }; - }; - UdebComponents - { - main; - non-free; - }; - }; - - Squeeze-Volatile - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Volatile Packages for Debian x.y (testing)"; - CodeName "squeeze-volatile"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - - }; - - Squeeze-Volatile-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-testing-changes@lists.debian.org"; - Origin "Debian"; - Description "Proposed Volatile Packages for Debian x.y (testing)"; - CodeName "squeeze-volatile-proposed-updates"; - OverrideCodeName "squeeze"; - OverrideSuite "testing"; - ValidTime 604800; // 7 days - NotAutomatic "yes"; - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - Stable; - Testing; - }; - Enhances - { - Testing; - }; - }; - }; - - Unstable - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Unstable - Not Released"; - CodeName "sid"; - OverrideCodeName "sid"; - ValidTime 604800; // 7 days - Priority "7"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - }; - }; - UdebComponents - { - main; - non-free; - }; - }; - - Experimental - { - Components - { - main; - contrib; - non-free; - }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Experimental packages - not released; use at your own risk."; - CodeName "experimental"; - NotAutomatic "yes"; - OverrideCodeName "sid"; - OverrideSuite "unstable"; - ValidTime 604800; // 7 days - Priority "0"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - Unstable; - }; - }; - UdebComponents - { - main; - non-free; - }; - }; - -}; - SuiteMappings { -// "propup-version oldstable-security stable testing testing-proposed-updates unstable"; + "silent-map squeeze-security oldoldstable-security"; + "silent-map wheezy-security oldstable-security"; + "silent-map jessie-security stable-security"; + "silent-map jessie-kfreebsd-security stable-kfreebsd-security"; "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; - "map lenny stable"; - "map lenny-volatile lenny-volatile-proposed-updates"; - "map squeeze testing"; - "map squeeze-volatile squeeze-volatile-proposed-updates"; + "map squeeze oldoldstable"; + "map squeeze-proposed-updates oldoldstable-proposed-updates"; + "map squeeze-updates oldoldstable-proposed-updates"; + "map wheezy oldstable"; + "map wheezy-proposed-updates oldstable-proposed-updates"; + "map wheezy-updates oldstable-proposed-updates"; + "map jessie stable"; + "map jessie-proposed-updates proposed-updates"; + "map jessie-updates proposed-updates"; + "map jessie-kfreebsd stable-kfreebsd"; + "map jessie-kfreebsd-proposed-updates stable-kfreebsd-proposed-updates"; + "map stretch testing"; + "map stretch-proposed-updates testing-proposed-updates"; + "map stretch-updates testing-proposed-updates"; "map sid unstable"; "map rc-buggy experimental"; -// "map oldstable oldstable-proposed-updates"; -// "map oldstable-security oldstable-proposed-updates"; + "map oldoldstable oldoldstable-proposed-updates"; + "map oldoldstable-security oldoldstable-proposed-updates"; + "map oldoldstable-updates oldoldstable-proposed-updates"; + "map oldstable oldstable-proposed-updates"; + "map oldstable-security oldstable-proposed-updates"; + "map oldstable-updates 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 stable-kfreebsd stable-kfreebsd-proposed-updates"; + "map stable-kfreebsd-security stable-kfreebsd-proposed-updates"; + "map testing-updates testing-proposed-updates"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; "map testing testing-proposed-updates"; "map testing-security testing-proposed-updates"; "map-unreleased testing unstable"; "map-unreleased testing-proposed-updates unstable"; + + "reject oldoldstable-proposed-updates"; + "reject stable-kfreebsd"; + "reject wheezy-updates"; + "reject jessie-updates"; + "reject stretch-updates"; }; AutomaticByHandPackages { + "debian-faq" { + Source "debian-faq"; + Section "byhand"; + Extension "gz"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-debian-faq"; + }; + "debian-installer-images" { Source "debian-installer"; Section "raw-installer"; @@ -560,6 +185,13 @@ AutomaticByHandPackages { Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-di"; }; + "linux-code-sign" { + Source "linux"; + Section "byhand"; + Extension "tar.xz"; + Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-code-sign"; + }; + "tag-overrides" { Source "tag-overrides"; Section "byhand"; @@ -573,42 +205,31 @@ 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 { + 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/"; - 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/"; + UrgencyLog "/srv/ftp.debian.org/web/britney/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/"; - Lenny-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/lenny-volatile-p-u-new"; - Squeeze-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/squeeze-volatile-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/"; + Done "/srv/ftp-master.debian.org/queue/done/"; + Reject "/srv/ftp-master.debian.org/queue/reject/"; }; Queue-Report @@ -621,146 +242,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 @@ -787,3 +275,30 @@ Common // The default number of threads for multithreading parts of dak: ThreadCount 16; } + +ByGroup { + dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak"; + ftpteam ""; + backports "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-backports"; +}; + +Command::DM { + ACL "dm"; + AdminKeyrings { + "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + }; + Keyrings { + "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"; + }; +}; + +Command::DM-Admin { + AdminFingerprints { + "AB41C1C68AFD668CA045EBF8673A03E4C1DB921F"; // gwolf + "0E3A94C3E83002DAB88CCA1694FA372B2DA8B985"; // noodles + + "80E976F14A508A48E9CA3FE9BC372252CA1CF964"; // ansgar + "FBFABDB541B5DC955BD9BA6EDB16CF5BB12525C4"; // joerg + "309911BEA966D0613053045711B4E5FF15B0FD82"; // mhy + }; +};