X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=192a039b29f16bc6ed234aafbaad3e32f745ec6a;hb=c91ff0bda6190f7b80b7976b578c10e68f97c5b1;hp=0ba61e394800bf559c7b218fc8e028a50c3f60f8;hpb=8914e2b474a44ae50b3b55c5c93d575c25a4d625;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 0ba61e39..192a039b 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -6,10 +6,9 @@ Dinstall
    };
    SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "55BE302B";
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
-   MyEmailAddress "Archive Administrator <installer@ftp-master.debian.org>";
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
@@ -26,10 +25,6 @@ Dinstall
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
-   QueueBuildSuites
-   {
-     unstable;
-   };
    Reject
    {
      NoSourceOnly "true";
@@ -59,11 +54,6 @@ Generate-Index-Diffs
    };
 };
 
-Override
-{
-   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
-};
-
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
@@ -110,7 +100,6 @@ Rm
     Suite "unstable";
    };
 
-   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
    LogFile "/srv/ftp.debian.org/web/removals.txt";
    LogFile822 "/srv/ftp.debian.org/web/removals.822";
    Bcc "removed-packages@qa.debian.org";
@@ -129,13 +118,6 @@ Import-Keyring
     };
 };
 
-Reject-Proposed-Updates
-{
-   StableRejector "the Stable Release Team";
-   StableMail "debian-release@lists.debian.org";
-   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/";
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
@@ -153,7 +135,6 @@ Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
-  QueueBuildStayOfExecution 86400; // 24 hours
   MorgueSubDir "pool";
 };
 
@@ -205,10 +186,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	CopyChanges "dists/proposed-updates/";
-	CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
-	OverrideSuite "stable";
-	ValidTime 604800; // 7 days
 	VersionChecks
 	{
 	  MustBeNewerThan
@@ -237,7 +214,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	ValidTime 604800; // 7 days
   };
 
   Testing-Proposed-Updates
@@ -248,8 +224,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideSuite "testing";
-	ValidTime 604800; // 7 days
 	VersionChecks
 	{
 	  MustBeNewerThan
@@ -279,8 +253,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideSuite "testing";
-	ValidTime 604800; // 7 days
 	VersionChecks
 	{
 	  MustBeNewerThan
@@ -304,7 +276,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	ValidTime 604800; // 7 days
 	VersionChecks
 	{
 	  MustBeNewerThan
@@ -326,8 +297,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideSuite "unstable";
-	ValidTime 604800; // 7 days
 	VersionChecks
 	{
 	  MustBeNewerThan
@@ -403,7 +372,6 @@ Dir
   Morgue "/srv/ftp-master.debian.org/morgue/";
   MorgueReject "reject";
   Override "/srv/ftp-master.debian.org/scripts/override/";
-  QueueBuild "/srv/incoming.debian.org/buildd/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
   Queue
@@ -440,27 +408,6 @@ DB
   Port 5433;
 };
 
-Architectures
-{
-  source "Source";
-  all "Architecture Independent";
-  alpha "DEC Alpha";
-  hurd-i386 "Intel ia32 running the HURD";
-  hppa "HP PA RISC";
-  amd64 "AMD64";
-  arm "ARM";
-  armel "ARM eabi";
-  i386 "Intel ia32";
-  ia64 "Intel ia64";
-  mips "MIPS (Big Endian)";
-  mipsel "MIPS (Little Endian)";
-  powerpc "PowerPC";
-  s390 "IBM S/390";
-  sparc "Sun SPARC/UltraSPARC";
-  kfreebsd-i386 "GNU/kFreeBSD i386";
-  kfreebsd-amd64 "GNU/kFreeBSD amd64";
-};
-
 Archive
 {
   ftp-master
@@ -492,72 +439,6 @@ Component
   };
 };
 
-Section
-{
-  admin;
-  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;
-  tex;
-  text;
-  utils;
-  web;
-  vcs;
-  video;
-  x11;
-  xfce;
-  zope;
-};
-
-Priority
-{
-  required 1;
-  important 2;
-  standard 3;
-  optional 4;
-  extra 5;
-  source 0; // i.e. unused
-};
-
 OverrideType
 {
   deb;
@@ -565,18 +446,6 @@ OverrideType
   dsc;
 };
 
-Location
-{
-
-  // Pool locations on ftp-master.debian.org
-  /srv/ftp-master.debian.org/ftp/pool/
-    {
-      Archive "ftp-master";
-      Type "pool";
-    };
-
-};
-
 Urgency
 {
   Default "low";