Merge branch 'master' of /org/ftp.debian.org/dak/

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 4959d445f7f83b401c71b3278aba36bb4e1cb14a..b8e1a4811f49a3e0a507f48feb844c8c516493ab 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -2,6 +2,7 @@ Dinstall
 {
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
+      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -125,6 +126,12 @@ Show-New
   HTMLPath "/srv/ftp.debian.org/web/new/";
 }
 
+Show-Deferred
+{
+  LinkPath "/srv/ftp.debian.org/web/deferred/";
+  DeferredQueue "/srv/queued/DEFERRED/";
+}
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
@@ -183,6 +190,7 @@ Import-LDAP-Fingerprints
   LDAPServer "db.debian.org";
   ExtraKeyrings
   {
+    "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
     "/srv/keyring.debian.org/keyrings/removed-keys.gpg";
     "/srv/keyring.debian.org/keyrings/extra-keys.pgp";
   };
@@ -398,6 +406,7 @@ Suite
        CodeName "etch-proposed-updates";
        OverrideCodeName "etch";
        OverrideSuite "stable";
+       ValidTime 604800; // 7 days
        Priority "4";
        VersionChecks
        {
@@ -452,6 +461,7 @@ Suite
        Description "Debian Testing distribution - Not Released";
        CodeName "lenny";
        OverrideCodeName "lenny";
+       ValidTime 604800; // 7 days
        Priority "5";
        UdebComponents
        {
@@ -491,6 +501,7 @@ Suite
        CodeName "testing-proposed-updates";
        OverrideCodeName "lenny";
        OverrideSuite "testing";
+       ValidTime 604800; // 7 days
        Priority "6";
        VersionChecks
        {
@@ -577,6 +588,7 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
+       ValidTime 604800; // 7 days
        Priority "7";
        VersionChecks
        {
@@ -629,6 +641,7 @@ Suite
        NotAutomatic "yes";
        OverrideCodeName "sid";
        OverrideSuite "unstable";
+       ValidTime 604800; // 7 days
        Priority "0";
        VersionChecks
        {