X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=92b77813d6fae1fd8a6b1733722ee0a57da12ade;hb=9240c69e5abaef1256f868030a6a181a79c3375f;hp=7098d048d35a660ece738c2f8cc2650779cde334;hpb=99eca4d3506844788195b1005708a9c7d6e05fd5;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 7098d048..92b77813 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,35 +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"; // 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 "; - MyAdminAddress "ftpmaster@debian.org"; + 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"; - 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 @@ -49,14 +39,16 @@ Generate-Index-Diffs { Options { + Archive "ftp-master"; TempDir "/srv/ftp-master.debian.org/tiffani"; - MaxDiffs { Default 14; }; + MaxDiffs { Default 56; }; }; }; Show-New { HTMLPath "/srv/ftp.debian.org/web/new/"; + Options::Queue "new,backports-new"; } Show-Deferred @@ -69,7 +61,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,dak-unpriv,katie,release,qa,www-data,guest,repuser,debian-backup"; }; Clean-Queues @@ -89,8 +81,6 @@ Control-Overrides Suite "unstable"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -105,23 +95,11 @@ 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"; LDAPServer "db.debian.org"; + CACertFile "/etc/ssl/servicecerts/db.debian.org.crt"; ExtraKeyrings { "/srv/keyring.debian.org/keyrings/removed-keys.pgp"; @@ -133,251 +111,60 @@ Import-LDAP-Fingerprints Clean-Suites { - // How long (in seconds) dead packages are left before being killed - StayOfExecution 129600; // 1.5 days 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 -{ - OldStable - { - Components - { - main; - contrib; - non-free; - }; - }; - - Stable - { - Components - { - main; - contrib; - non-free; - }; - }; - - OldStable-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - }; - Enhances - { - OldStable; - }; - }; - }; - - Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; - }; -// MustBeOlderThan -// { -// Testing; -// Unstable; -// Experimental; -// }; - Enhances - { - Stable; - }; - }; - }; - - Testing - { - Components - { - main; - contrib; - non-free; - }; - }; - - Testing-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - Enhances - { - Testing; - }; - }; - }; - - Squeeze-Updates - { - Components - { - main; - contrib; - non-free; - }; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - MustBeOlderThan - { - Testing; - Testing-Proposed-Updates; - Unstable; - Experimental; - }; - Enhances - { - Stable; - }; - }; - - }; - - Unstable - { - Components - { - main; - contrib; - non-free; - }; - VersionChecks - { - MustBeNewerThan - { - OldStable; - Stable; -// Proposed-Updates; - Testing; - Testing-Proposed-Updates; - }; - }; - }; - - Experimental - { - Components - { - main; - 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"; + "silent-map squeeze-security oldstable-security"; + "silent-map wheezy-security stable-security"; + "silent-map jessie-security testing-security"; "propup-version stable-security testing testing-proposed-updates unstable"; "propup-version testing-security unstable"; - "map lenny oldstable"; - "map squeeze stable"; - "map wheezy testing"; + "map squeeze oldstable"; + "map squeeze-proposed-updates oldstable-proposed-updates"; + "map squeeze-updates oldstable-proposed-updates"; + "map wheezy stable"; + "map wheezy-proposed-updates proposed-updates"; + "map wheezy-updates proposed-updates"; + "map jessie testing"; + "map jessie-proposed-updates testing-proposed-updates"; + "map jessie-updates testing-proposed-updates"; "map sid unstable"; "map rc-buggy experimental"; "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 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 oldstable-proposed-updates"; + "reject jessie-backports"; + "reject jessie-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"; @@ -408,37 +195,22 @@ AutomaticByHandPackages { 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/"; - 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/"; - 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 "/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/"; - }; + 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 @@ -451,47 +223,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 @@ -526,38 +264,29 @@ Changelogs Export "/srv/ftp-master.debian.org/export/changelogs"; } -Generate-Releases -{ - MD5 - { - oldstable; - oldstable-proposed-updates; - proposed-updates; - stable; - squeeze-updates; +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"; }; - SHA1 - { - oldstable; - oldstable-proposed-updates; - proposed-updates; - squeeze-updates; - stable; - testing; - testing-proposed-updates; - unstable; - experimental; + Keyrings { + "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"; }; - SHA256 - { - oldstable; - oldstable-proposed-updates; - proposed-updates; - squeeze-updates; - stable; - testing; - testing-proposed-updates; - unstable; - experimental; +}; + +Command::DM-Admin { + AdminFingerprints { + "AB41C1C68AFD668CA045EBF8673A03E4C1DB921F"; // gwolf + "0E3A94C3E83002DAB88CCA1694FA372B2DA8B985"; // noodles + + "80E976F14A508A48E9CA3FE9BC372252CA1CF964"; // ansgar + "FBFABDB541B5DC955BD9BA6EDB16CF5BB12525C4"; // joerg + "309911BEA966D0613053045711B4E5FF15B0FD82"; // mhy }; -} +};