X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdak.conf;h=b9dd0a558cc9c1e20b09f4fc8e08168b320205bf;hb=3950b9877f066f4946d5ac1eec121913f9594142;hp=921e0f3a79bd029103c7254481729d14df825045;hpb=078a2082d56590ce9182c44e4cae3dd6dca084cb;p=dak.git

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 921e0f3a..b9dd0a55 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -9,9 +9,8 @@ Dinstall
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "16BA136C 55BE302B";
-   SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
-   MyEmailAddress "backports.debian.org archive Installer <installer@backports.debian.org>";
+   SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@backports.debian.org";
+   MyEmailAddress "Backports Debian FTP Masters <ftpmaster@backports.debian.org>";
    MyAdminAddress "ftpmaster@backports.debian.org";
    MyHost "backports.debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "backports.debian.org archive"; // Used in emails
@@ -56,11 +55,6 @@ Generate-Index-Diffs
    };
 };
 
-Override
-{
-   MyEmailAddress "backports.debian.org archive FTP Masters <ftpmaster@backports.debian.org>";
-};
-
 Add-User
 {
 // Should we sent a mail to newly added users?
@@ -102,12 +96,6 @@ Check-Overrides
 //      OriginSuite "Unstable";
     };
 
-    etch-backports
-    {
-      Process "1";
-//      OriginSuite "Unstable";
-    };
-
 //    Unstable
 //    {
 //    Process "0";
@@ -160,9 +148,8 @@ Rm
     Suite "lenny-backports";
    };
 
-   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";
+   LogFile "/srv/backports-web.debian.org/underlay/removals.txt";
+   LogFile822 "/srv/backports-web.debian.org/underlay/removals.822";
 };
 
 Import-Archive
@@ -194,14 +181,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-
-	Announce "debian-backports-changes@lists.debian.org";
-	Origin "Debian Backports";
-	Description "Backports for the Lenny Distribution";
-	CodeName "lenny-backports";
-	OverrideCodeName "lenny-backports";
-	Priority "7";
-	NotAutomatic "yes";
   };
 
 
@@ -213,31 +192,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-
-	Announce "debian-backports-changes@lists.debian.org";
-	Origin "Debian Backports";
-	Description "Backports for the Squeeze Distribution";
-	CodeName "squeeze-backports";
-	OverrideCodeName "squeeze-backports";
-	Priority "7";
-	NotAutomatic "yes";
-  };
-
-  etch-backports
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Announce "debian-backports-changes@lists.debian.org";
-	Origin "backports.debian.org archive";
-	Description "Backports for the Etch Distribution";
-	CodeName "etch-backports";
-	OverrideCodeName "etch-backports";
-	Priority "7";
-	NotAutomatic "yes";
   };
 
 };
@@ -249,6 +203,7 @@ Dir
   Templates "/srv/backports-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/backports-master.debian.org/database/dists/";
+  Cache "/srv/backports-master.debian.org/database/";
   Log "/srv/backports-master.debian.org/log/";
   Lock "/srv/backports-master.debian.org/lock";
   Morgue "/srv/backports-master.debian.org/morgue/";
@@ -276,7 +231,7 @@ Dir
 
 DB
 {
-  Name "projectb";
+  Name "backports";
   Host "";
   Port -1;
 };
@@ -459,3 +414,8 @@ Import-LDAP-Fingerprints
   };
   KeyServer "wwwkeys.eu.pgp.net";
 };
+
+Changelogs
+{
+  Export "/srv/backports-master.debian.org/export/changelogs";
+}