X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=b8560c5ef98d93b1c9efd26bfd866fb705edde5b;hb=1af0343f2bcab92549d41426be7acd4fe7361206;hp=97215f5929ebcf0f96fdbca3627e1e6a6065b4b5;hpb=e69a7f8825d98e99018dae48e7ed946172679bfa;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 97215f59..b8560c5e 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -8,7 +8,7 @@ Dinstall
    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()
@@ -207,22 +207,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-changes@lists.debian.org";
 	// Version "4.0r1";
 	Origin "Debian";
@@ -247,22 +231,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/oldstable-proposed-updates/";
 	CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
@@ -307,23 +275,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-changes@lists.debian.org";
 	// Version "5.0r0";
 	Origin "Debian";
@@ -348,23 +299,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  arm;
-          armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
 	CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
@@ -383,12 +317,12 @@ Suite
 	  {
 	    Stable;
 	  };
-	  MustBeOlderThan
-	  {
-	    Testing;
-	    Unstable;
-	    Experimental;
-	  };
+//	  MustBeOlderThan
+//	  {
+//	    Testing;
+//	    Unstable;
+//	    Experimental;
+//	  };
 	  Enhances
           {
 	    Stable;
@@ -409,22 +343,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution - Not Released";
@@ -447,22 +365,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
@@ -476,7 +378,7 @@ Suite
 	  MustBeNewerThan
 	  {
 	    Stable;
-	    Proposed-Updates;
+//	    Proposed-Updates;
 	    Testing;
 	  };
 	  MustBeOlderThan
@@ -504,12 +406,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  m68k;
-	};
 	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Etch for m68k - Not Released";
@@ -531,23 +427,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  armel;
-	  hppa;
-	  hurd-i386;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-devel-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Unstable - Not Released";
@@ -560,7 +439,7 @@ Suite
 	  MustBeNewerThan
 	  {
 	    Stable;
-	    Proposed-Updates;
+//	    Proposed-Updates;
 	    Testing;
 	    Testing-Proposed-Updates;
 	  };
@@ -580,23 +459,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  amd64;
-	  armel;
-	  hppa;
-	  hurd-i386;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "debian-devel-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
@@ -611,7 +473,7 @@ Suite
 	  MustBeNewerThan
 	  {
 	    Stable;
-	    Proposed-Updates;
+//	    Proposed-Updates;
 	    Testing;
 	    Testing-Proposed-Updates;
 	    Unstable;
@@ -728,6 +590,7 @@ Architectures
   hppa "HP PA RISC";
   amd64 "AMD64";
   arm "ARM";
+  armel "ARM eabi";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
@@ -768,12 +631,6 @@ Component
 	Description "Software that fails to meet the DFSG";
 	MeetsDFSG "false";
   };
-
-  mixed  // **NB:** only used for overrides; not yet used in other code
-  {
-	Description "Legacy Mixed";
-	MeetsDFSG "false";
-  };
 };
 
 Section
@@ -856,7 +713,8 @@ Urgency
   };
 };
 
-Content
+Contents
 {
-  Header "contents"
+  Header "contents";
+  Root "/srv/ftp.debian.org/ftp/";
 }
\ No newline at end of file