]> git.decadent.org.uk Git - dak.git/blobdiff - config/debian/dak.conf
Move urgency log from release.d.o to our web dir
[dak.git] / config / debian / dak.conf
index 293df65dc1eaac04fbde44f2196e2fc78742527a..a7e34cba14ff6a7b343a76a0e28bf2c2f9544dcf 100644 (file)
@@ -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 <ftpmaster@ftp-master.debian.org>";
-   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
@@ -67,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,katie,release,qa,www-data,guest,repuser";
+  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/ca-debian/ca-certificates.crt";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -133,165 +111,73 @@ 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;
-       };
-  };
-
-  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 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 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 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 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-unreleased oldstable unstable";
+ "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";
@@ -322,36 +208,21 @@ 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/";
   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/";
-  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/";
+  Done "/srv/ftp-master.debian.org/queue/done/";
+  Reject "/srv/ftp-master.debian.org/queue/reject/";
 };
 
 Queue-Report
@@ -373,16 +244,6 @@ DB
   Unicode "false"
 };
 
-Archive
-{
-  ftp-master
-  {
-    OriginServer "ftp-master.debian.org";
-    PrimaryMirror "ftp.debian.org";
-    Description "Master Archive for the Debian project";
-  };
-};
-
 Urgency
 {
   Default "low";
@@ -408,49 +269,29 @@ 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";
-}
+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";
+};
 
-Generate-Releases
-{
-  MD5Sum
-  {
-    oldstable;
-    oldstable-proposed-updates;
-    proposed-updates;
-    stable;
-    squeeze-updates;
-    testing;
-    testing-proposed-updates;
-    unstable;
-    experimental;
+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
   };
-}
+};