X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=a7e34cba14ff6a7b343a76a0e28bf2c2f9544dcf;hp=db223e350e1943eb837d94298bec2fbe35f5e1d3;hb=a5f012fc23024078b91ee10dfdd077120cde74c9;hpb=2c685a1e3c07384b643564719243f5376e3e3b59 diff --git a/config/debian/dak.conf b/config/debian/dak.conf index db223e35..a7e34cba 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -5,15 +5,13 @@ Dinstall // 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"; Bcc "archive@ftp-master.debian.org"; - FutureTimeTravelGrace 28800; // 8 hours - PastCutoffYear "1984"; SkipTime 300; BXANotify "true"; CloseBugs "true"; @@ -21,6 +19,7 @@ Dinstall DefaultSuite "unstable"; LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags"; 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 @@ -40,6 +39,7 @@ Generate-Index-Diffs { Options { + Archive "ftp-master"; TempDir "/srv/ftp-master.debian.org/tiffani"; MaxDiffs { Default 56; }; }; @@ -59,9 +59,9 @@ Show-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,dak-unpriv,katie,release,qa,www-data,guest,repuser"; + KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser,debian-backup"; }; Clean-Queues @@ -99,6 +99,7 @@ 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"; @@ -110,8 +111,6 @@ Import-LDAP-Fingerprints Clean-Suites { - // How long (in seconds) dead packages are left before being killed - StayOfExecution 129600; // 1.5 days MorgueSubDir "pool"; }; @@ -120,124 +119,42 @@ Process-New 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; - }; - }; - - Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - }; - - Testing - { - Components - { - main; - contrib; - non-free; - }; - }; - - Testing-Proposed-Updates - { - Components - { - main; - contrib; - non-free; - }; - }; - - Squeeze-Updates - { - Components - { - main; - contrib; - non-free; - }; - }; - - Unstable - { - Components - { - main; - contrib; - non-free; - }; - }; - - Experimental - { - Components - { - main; - contrib; - non-free; - }; - }; -}; - SuiteMappings { - "silent-map squeeze-security oldstable-security"; - "silent-map wheezy-security stable-security"; - "silent-map jessie-security testing-security"; + "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 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 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 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 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"; @@ -245,9 +162,22 @@ SuiteMappings "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"; @@ -288,10 +218,9 @@ Dir Lock "/srv/ftp-master.debian.org/lock"; Morgue "/srv/ftp-master.debian.org/morgue/"; Override "/srv/ftp-master.debian.org/scripts/override/"; - UrgencyLog "/srv/release.debian.org/britney/input/urgencies/"; + UrgencyLog "/srv/ftp.debian.org/web/britney/urgencies/"; TempPath "/srv/ftp-master.debian.org/tmp/"; 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/"; }; @@ -340,47 +269,6 @@ Common 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 - { - proposed-updates; - stable; - squeeze-updates; - testing; - testing-proposed-updates; - unstable; - experimental; - }; - SHA1 - { - proposed-updates; - squeeze-updates; - stable; - testing; - testing-proposed-updates; - unstable; - experimental; - }; - SHA256 - { - proposed-updates; - squeeze-updates; - stable; - testing; - testing-proposed-updates; - unstable; - experimental; - }; -} - ByGroup { dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak"; ftpteam "";