Content generation seems to be working now

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 77f5c918f11fd3a0a108e5032721fa8e2981461d..3e73e4bac6a0d57848bb4dd908018495b7eec7f2 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,14 +1,16 @@
 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";
+      "/usr/share/keyrings/debian-keyring.gpg";
+      "/usr/share/keyrings/debian-keyring.pgp";
+      "/usr/share/keyrings/debian-keyring.pgp";
+//      "/srv/ftp.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "6070D3A1";
-   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+//   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+   SendmailCommand "/bin/echo -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
@@ -24,7 +26,6 @@ Dinstall
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "false";
    DefaultSuite "unstable";
    UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py";
    QueueBuildSuites
@@ -43,56 +44,6 @@ Transitions
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
-Binary-Upload-Restrictions
-{
- Components
- {
-   //main;
-   //contrib;
-   // Yay for consensus through GRs voted on by people not actually involved in the affected architectures
-   none;
- };
- unstable
- {
-   arm
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-     F849E2025D1C194DE62BC6C829BE5D2268FD549F;
-   };
-   alpha 
-   {
-     9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5;
-     70BC7F9D8C60D2265B7076A23760DBCFFD6645AB;
-   };   
-  };
-};
-
 Generate-Index-Diffs
 {
    Options
@@ -177,11 +128,19 @@ Import-Archive
   ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
+Import-Keyring
+{
+  /srv/ftp.debian.org/keyrings/debian-maintainers.gpg
+    {
+      Debian-Maintainer "true";
+    };
+};
+
 Reject-Proposed-Updates
 {
    StableRejector "the Stable Release Team";
    StableMail "debian-release@lists.debian.org";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r5/";
+   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/";
 };
 
 Import-LDAP-Fingerprints
@@ -400,7 +359,7 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
-       CodeName "testing-proposed-updates";
+       CodeName "lenny-proposed-updates";
        OverrideCodeName "lenny";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
@@ -477,7 +436,6 @@ Suite
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -528,7 +486,6 @@ Suite
          hurd-i386;
          i386;
          ia64;
-         m68k;
          mips;
          mipsel;
          powerpc;
@@ -642,6 +599,14 @@ Dir
   };
 };
 
+Queue-Report
+{
+  ReportLocations
+  {
+    822Location "/srv/ftp.debian.org/web/new.822";
+  };
+};
+
 DB
 {
   Name "projectb";
@@ -785,3 +750,8 @@ Urgency
     critical;
   };
 };
+
+Content
+{
+  Header "contents"
+}
\ No newline at end of file