From: James Troup <james@nocrew.org>
Date: Sat, 24 Nov 2001 18:35:18 +0000 (+0000)
Subject: sync
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bfe579f11d1eb9f94cb5c755b5c568502135441a;p=dak.git
sync
---
diff --git a/cron.hourly-non-US b/cron.hourly-non-US
index 53bcd20e..0ad9da74 100644
--- 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 b968bdb1..8c13ff0c 100644
--- 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 c14e8a42..b75ebb7b 100644
--- 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()