X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=756a37c3c11ce249ba6fa1f9d1f8cbc4d21ed1b9;hb=35cd0972b5e14dc8727403e13fccd30776f3ae02;hp=b95fa633dc527e525a7b0ca314f4a33ccb032d90;hpb=485eac6e5a57d38bfdc7f84aaf982db02405e62e;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b95fa633..756a37c3 100644
--- 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()
@@ -47,6 +47,7 @@ Dinstall
 
 Transitions
 {
+   Notifications "team@release.debian.org";
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
@@ -173,6 +174,7 @@ Clean-Suites
 Process-New
 {
   AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock";
+  LockDir "/srv/ftp.debian.org/lock/new/";
 };
 
 Check-Overrides
@@ -214,7 +216,6 @@ Suite
 	CodeName "etch";
 	OverrideCodeName "etch";
 	Priority "5";
-	Untouchable "1";
 	ChangeLogBase "dists/oldstable/";
 	UdebComponents
 	{
@@ -282,7 +283,6 @@ Suite
 	CodeName "lenny";
 	OverrideCodeName "lenny";
 	Priority "5";
-	Untouchable "1";
 	ChangeLogBase "dists/stable/";
 	UdebComponents
 	{
@@ -505,6 +505,7 @@ SuiteMappings
  "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
+ "reject etch-m68k";
 };
 
 AutomaticByHandPackages {
@@ -600,6 +601,8 @@ Architectures
   s390 "IBM S/390";
   sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";
+  kfreebsd-i386 "GNU/kFreeBSD i386";
+  kfreebsd-amd64 "GNU/kFreeBSD amd64";
 };
 
 Archive
@@ -636,31 +639,45 @@ Component
 Section
 {
   admin;
-  base;
+  cli-mono;
   comm;
+  database;
   debian-installer;
+  debug;
   devel;
   doc;
   editors;
   embedded;
   electronics;
+  fonts;
   games;
   gnome;
   graphics;
+  gnu-r;
+  gnustep;
   hamradio;
+  haskell;
+  httpd;
   interpreters;
+  java;
   kde;
+  kernel;
   libdevel;
   libs;
+  lisp;
+  localization;
   mail;
   math;
   misc;
   net;
   news;
+  ocaml;
   oldlibs;
   otherosfs;
   perl;
+  php;
   python;
+  ruby;
   science;
   shells;
   sound;
@@ -668,7 +685,11 @@ Section
   text;
   utils;
   web;
+  vcs;
+  video;
   x11;
+  xfce;
+  zope;
 };
 
 Priority
@@ -712,3 +733,9 @@ Urgency
     critical;
   };
 };
+
+Contents
+{
+  Header "contents";
+  Root "/srv/ftp.debian.org/test/";
+}