Remove Clean-Suites::StayOfExecution.

[dak.git] / config / debian / dak.conf

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 85ff4a39aa5f7da45a416d2a27f16b28ca713978..b43f950c31a0d042fff8e03080699d9245749f87 100644 (file)
--- 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 <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";
    Bcc "archive@ftp-master.debian.org";
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 300;
    BXANotify "true";
    CloseBugs "true";
@@ -40,6 +38,7 @@ Generate-Index-Diffs
 {
    Options
    {
+     Archive "ftp-master";
      TempDir "/srv/ftp-master.debian.org/tiffani";
      MaxDiffs { Default 56; };
    };
@@ -61,7 +60,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // 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 +98,7 @@ Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
+  CACertFile "/etc/ssl/certs/spi-cacert-2008.pem";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -110,8 +110,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,115 +118,27 @@ 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 stable-security";
- "silent-map wheezy-security testing-security";
+ "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 squeeze stable";
- "map squeeze-proposed-updates proposed-updates";
- "map squeeze-updates proposed-updates";
- "map wheezy testing";
- "map wheezy-proposed-updates testing-proposed-updates";
- "map wheezy-updates testing-proposed-updates";
+ "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";
@@ -240,9 +150,19 @@ SuiteMappings
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
+
+ "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";
@@ -277,7 +197,6 @@ 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/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
   Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
@@ -343,40 +262,6 @@ Changelogs
   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 "";