Merge remote branch 'tolimar/rm-close-bugs' into merge

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 993cb80da76c9cad76b254afefdf9ee0313abcb0..57f839d730d8e9a417b500508acde3b76d6cb02a 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -9,9 +9,8 @@ Dinstall
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "55BE302B";
-   SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
-   MyEmailAddress "backports.debian.org archive Installer <installer@backports.debian.org>";
+   SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@backports.debian.org";
+   MyEmailAddress "Backports Debian FTP Masters <ftpmaster@backports.debian.org>";
    MyAdminAddress "ftpmaster@backports.debian.org";
    MyHost "backports.debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "backports.debian.org archive"; // Used in emails
@@ -33,7 +32,7 @@ Dinstall
    SkipTime 300;
    // If defined then mails to close bugs are sent to the bugserver.
    CloseBugs "false";
-   OverrideDisparityCheck "true";
+   OverrideDisparityCheck "false";
    DefaultSuite "lenny-backports";
    Reject
    {
@@ -56,11 +55,6 @@ Generate-Index-Diffs
    };
 };
 
-Override
-{
-   MyEmailAddress "backports.debian.org archive FTP Masters <ftpmaster@backports.debian.org>";
-};
-
 Add-User
 {
 // Should we sent a mail to newly added users?
@@ -154,9 +148,8 @@ Rm
     Suite "lenny-backports";
    };
 
-   MyEmailAddress "backports.debian.org archive Maintenance <ftpmaster@backports.debian.org>";
-   LogFile "/srv/backports-master.debian.org/ftp/removals.txt";
-   LogFile822 "/srv/backports-master.debian.org/ftp/removals.822";
+   LogFile "/srv/backports-web.debian.org/underlay/removals.txt";
+   LogFile822 "/srv/backports-web.debian.org/underlay/removals.822";
 };
 
 Import-Archive