sync

diff --git a/cron.hourly-non-US b/cron.hourly-non-US
index 53bcd20e7204c3e17b423c88e04fb8442c116b05..0ad9da74959ca947ade0429dfd3efd658c15eeaf 100644 (file)
--- a/cron.hourly-non-US
+++ b/cron.hourly-non-US
@@ -3,7 +3,7 @@
 # Executed hourly via cron, out of troup's crontab.
 
 set -e
-export SCRIPTVARS=/org/non-us.debian.org/katie/vars
+export SCRIPTVARS=/org/non-us.debian.org/katie/vars-non-US
 . $SCRIPTVARS
 
 cd $masterdir

diff --git a/katie.conf b/katie.conf
index b968bdb1cdbbefaa49ce993a454d692f723a1080..8c13ff0c2c965063198abddd02f1ca52424759ba 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -3,7 +3,7 @@ Dinstall
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
-   SendmailCommand "/usr/sbin/sendmail -oi -t";
+   SendmailCommand "/usr/sbin/sendmail -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()
@@ -444,6 +444,6 @@ Location
 
 Catherine {
        Options {
-               Limit   10240;
+               Limit   20480;
        };
 };

diff --git a/katie.conf-non-US b/katie.conf-non-US
index c14e8a427b8d736f4181d52dced0e6c2e1852ee4..b75ebb7b961484a0c1ed6c6e4fb34876ff35d6ae 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -3,7 +3,7 @@ Dinstall
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
-   SendmailCommand "/usr/sbin/sendmail -oi -t";
+   SendmailCommand "/usr/sbin/sendmail -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()