[dak/master] dak.conf
update to todays stuff
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/backports/dak.conf | 47 ++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 502c000..4d9b90f 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -10,7 +10,7 @@ Dinstall
SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
SigningKeyIds "16BA136C";
- SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+ SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
MyEmailAddress "backports.debian.org archive Installer <installer@backports.debian.org>";
MyAdminAddress "ftpmaster@backports.debian.org";
MyHost "backports.debian.org"; // used for generating user@my_host addresses in e.g. manual_reject()
@@ -41,6 +41,9 @@ Dinstall
ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
};
// If set, only send mails to addresses listed there.
+ // format of entries: one entry per line. Either an email address directly, or a regular expression,
+ // prefixed by "RE:". Examples: "jane.doe@domain.com" or "RE:jane[^@]@domain.com", where the first will
+ // only allow to mail jane.doe@domain.com while the second will mail all of jane*@domain.com
MailWhiteList "/srv/backports-master.debian.org/dak/config/backports/mail-whitelist";
};
@@ -74,10 +77,15 @@ Add-User
// which uma should add the user. NO spaces between the groupnames or
// useradd will die.
// Disable it if you dont want or need that feature.
- GID "debuser";
+// GID "debuser";
};
+Show-New
+{
+ HTMLPath "/srv/backports-master.debian.org/web/new/";
+}
+
Check-Overrides
{
OverrideSuites
@@ -105,9 +113,9 @@ Check-Overrides
Import-Users-From-Passwd
{
// The Primary GID of your users. Using uma it is the gid from group users.
- ValidGID "1001";
+ ValidGID "800";
// Comma separated list of users who are in Postgres but not the passwd file
- KnownPostgres "postgres,katie";
+ KnownPostgres "postgres,katie,dak,www-data,qa,guest";
};
Clean-Queues
@@ -140,6 +148,7 @@ Rm
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";
};
Import-Archive
@@ -158,6 +167,7 @@ Clean-Suites
Process-New
{
AcceptedLockFile "/srv/backports-master.debian.org/lock/unchecked.lock";
+ LockDir "/srv/backports-master.debian.org/lock/new/";
};
Suite
@@ -207,24 +217,25 @@ Dir
PoolRoot "pool/";
Lists "/srv/backports-master.debian.org/database/dists/";
Log "/srv/backports-master.debian.org/log/";
+ Lock "/srv/backports-master.debian.org/lock";
Morgue "/srv/backports-master.debian.org/morgue/";
MorgueReject "reject";
- Lock "/srv/backports-master.debian.org/lock";
Override "/srv/backports-master.debian.org/scripts/override/";
+ QueueBuild "/srv/backports-master.debian.org/buildd/";
UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/";
+ TempPath "/srv/backports-master.debian.org/tmp";
Queue
{
- Accepted "/srv/backports-master.debian.org/queue/accepted/";
Byhand "/srv/backports-master.debian.org/queue/byhand/";
Done "/srv/backports-master.debian.org/queue/done/";
Holding "/srv/backports-master.debian.org/queue/holding/";
New "/srv/backports-master.debian.org/queue/new/";
- ProposedUpdates "/srv/backports-master.debian.org/queue/p-u-new/";
Reject "/srv/backports-master.debian.org/queue/reject/";
Unchecked "/srv/backports-master.debian.org/queue/unchecked/";
BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
Embargoed "/srv/backports-master.debian.org/queue/Embargoed/";
Unembargoed "/srv/backports-master.debian.org/queue/Unembargoed/";
+ ProposedUpdates "/srv/backports-master.debian.org/queue/p-u-new/";
OldProposedUpdates "/srv/backports-master.debian.org/queue/Unembargoed/";
};
};
@@ -238,22 +249,12 @@ DB
SuiteMappings
{
- "propup-version stable-security testing";
- "propup-version testing-security unstable";
-// "map stable proposed-updates";
"map lenny lenny-backports";
"map lenny-bpo lenny-backports";
"map etch etch-backports";
// formi mag des nit
// "map stable etch-backports";
"map etch-bpo etch-backports";
-// "map stable-security proposed-updates";
-// "map-unreleased stable unstable";
-// "map-unreleased proposed-updates unstable";
-// "map testing testing-proposed-updates";
-// "map testing-security testing-proposed-updates";
-// "map-unreleased testing unstable";
-// "map-unreleased testing-proposed-updates unstable";
};
Architectures
@@ -275,6 +276,8 @@ Architectures
s390 "IBM S/390";
sh "Hitatchi SuperH";
sparc "Sun SPARC/UltraSPARC";
+ kfreebsd-i386 "GNU/kFreeBSD i386";
+ kfreebsd-amd64 "GNU/kFreeBSD amd64";
};
Archive
@@ -303,8 +306,8 @@ Component
non-free
{
- Description "Software that fails to meet the DFSG";
- MeetsDFSG "false";
+ Description "Software that fails to meet the DFSG";
+ MeetsDFSG "false";
};
};
@@ -405,3 +408,9 @@ Urgency
critical;
};
};
+
+Common
+{
+ // The default number of threads for multithreading parts of dak:
+ ThreadCount 16;
+}
--
1.5.6.5
Reply to: