X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=b43f950c31a0d042fff8e03080699d9245749f87;hb=4783de88f06b5bd7eeadfc46712c5ae39cdb7764;hp=9258ec6e84c65d3b82af693d0879974e35a07471;hpb=394eaf39d605f9b0e916d25d3d5cd223b0c5246e;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 9258ec6e..b43f950c 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -38,6 +38,7 @@ Generate-Index-Diffs
 {
    Options
    {
+     Archive "ftp-master";
      TempDir "/srv/ftp-master.debian.org/tiffani";
      MaxDiffs { Default 56; };
    };
@@ -59,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
@@ -97,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";
@@ -108,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";
 };
 
@@ -118,101 +118,6 @@ 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";
@@ -245,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";
@@ -347,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 "";