Revert "Revert "Merge commit 'stew/content_generation' into merge""

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3cd6705bdbf25da0a9aaeea5007f0e99d4e29eac..b8560c5ef98d93b1c9efd26bfd866fb705edde5b 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,14 +1,14 @@
 Dinstall
 {
    GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; 
+      "/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";
    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 -f envelope@ftp-master.debian.org";
    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()
@@ -317,12 +317,12 @@ Suite
          {
            Stable;
          };
-         MustBeOlderThan
-         {
-           Testing;
-           Unstable;
-           Experimental;
-         };
+//       MustBeOlderThan
+//       {
+//         Testing;
+//         Unstable;
+//         Experimental;
+//       };
          Enhances
           {
            Stable;
@@ -378,7 +378,7 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
          };
          MustBeOlderThan
@@ -439,7 +439,7 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
          };
@@ -473,7 +473,7 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Proposed-Updates;
+//         Proposed-Updates;
            Testing;
            Testing-Proposed-Updates;
            Unstable;
@@ -631,12 +631,6 @@ Component
        Description "Software that fails to meet the DFSG";
        MeetsDFSG "false";
   };
-
-  mixed  // **NB:** only used for overrides; not yet used in other code
-  {
-       Description "Legacy Mixed";
-       MeetsDFSG "false";
-  };
 };
 
 Section
@@ -718,3 +712,9 @@ Urgency
     critical;
   };
 };
+
+Contents
+{
+  Header "contents";
+  Root "/srv/ftp.debian.org/ftp/";
+}
\ No newline at end of file