X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdak.conf;h=a9f4886c9627275b4844bbb76ceb16d5ebd5d415;hb=34d31a60a7db0024d3194adf0004ff916de34b0a;hp=5169e8bf36899c2a6806c6fdae1e3608859c9f84;hpb=f4a65a1321f0e658dc11803e16adcb9a4f4aa5af;p=dak.git

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 5169e8bf..a9f4886c 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 "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
@@ -33,7 +32,7 @@ Dinstall
    SkipTime 300;
    // If defined then mails to close bugs are sent to the bugserver.
    CloseBugs "false";
-   OverrideDisparityCheck "true";
+   OverrideDisparityCheck "false";
    DefaultSuite "lenny-backports";
    Reject
    {
@@ -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?
@@ -96,16 +90,18 @@ Check-Overrides
 //      OriginSuite "Unstable";
     };
 
+    lenny-backports-sloppy
+    {
+      Process "1";
+//      OriginSuite "Unstable";
+    };
+
     squeeze-backports
     {
       Process "1";
 //      OriginSuite "Unstable";
     };
 
-//    Unstable
-//    {
-//    Process "0";
-//  };
   };
 };
 
@@ -115,7 +111,7 @@ Import-Users-From-Passwd
   // The Primary GID of your users. Using uma it is the gid from group users.
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie,dak,www-data,qa,guest";
+  KnownPostgres "postgres,katie,dak,www-data,qa,guest,repuser";
 };
 
 Queue-Report
@@ -154,9 +150,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
@@ -188,13 +183,17 @@ Suite
 	  contrib;
 	  non-free;
 	};
-
-	CodeName "lenny-backports";
-	OverrideCodeName "lenny-backports";
-	Priority "7";
-	NotAutomatic "yes";
   };
 
+  lenny-backports-sloppy
+  {
+	Components
+	{
+	  main;
+	  contrib;
+	  non-free;
+	};
+  };
 
   squeeze-backports
   {
@@ -204,11 +203,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-
-	CodeName "squeeze-backports";
-	OverrideCodeName "squeeze-backports";
-	Priority "7";
-	NotAutomatic "yes";
   };
 
 };
@@ -217,6 +211,7 @@ Dir
 {
   Root "/srv/backports-master.debian.org/ftp/";
   Pool "/srv/backports-master.debian.org/ftp/pool/";
+  Export "/srv/backports-master.debian.org/export/";
   Templates "/srv/backports-master.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/srv/backports-master.debian.org/database/dists/";
@@ -224,7 +219,6 @@ Dir
   Log "/srv/backports-master.debian.org/log/";
   Lock "/srv/backports-master.debian.org/lock";
   Morgue "/srv/backports-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/backports-master.debian.org/scripts/override/";
   QueueBuild "/srv/backports-master.debian.org/buildd/";
   UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/";
@@ -248,15 +242,20 @@ Dir
 
 DB
 {
-  Name "backports";
-  Host "";
-  Port -1;
+  Service "backports";
+  // PoolSize should be at least ThreadCount + 1
+  PoolSize 5;
+  // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize
+  MaxOverflow 13;
+  // should be false for encoding == SQL_ASCII
+  Unicode "false"
 };
 
 SuiteMappings
 {
  "map lenny lenny-backports";
  "map lenny-bpo lenny-backports";
+ "map lenny-bpo-sloppy lenny-backports-sloppy";
  "map squeeze squeeze-backports";
  "map squeeze-bpo squeeze-backports";
 };
@@ -294,28 +293,6 @@ Archive
   };
 };
 
-Component
-{
-  main
-  {
-	Description "Main";
-	MeetsDFSG "true";
-  };
-
-  contrib
-  {
-	Description "Contrib";
-	MeetsDFSG "true";
-  };
-
-  non-free
-  {
-     Description "Software that fails to meet the DFSG";
-     MeetsDFSG "false";
-  };
-
-};
-
 Section
 {
   admin;
@@ -382,24 +359,6 @@ Priority
   source 0; // i.e. unused
 };
 
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
-Location
-{
-  // Pool locations on backports.debian.org
-  /srv/backports-master.debian.org/ftp/pool/
-    {
-      Archive "backports";
-      Type "pool";
-    };
-
-};
-
 Urgency
 {
   Default "low";
@@ -436,3 +395,25 @@ Changelogs
 {
   Export "/srv/backports-master.debian.org/export/changelogs";
 }
+
+Generate-Releases
+{
+  MD5Sum
+  {
+    lenny-backports;
+    lenny-backports-sloppy;
+    squeeze-backports;
+  };
+  SHA1
+  {
+    lenny-backports;
+    lenny-backports-sloppy;
+    squeeze-backports;
+  };
+  SHA256
+  {
+    lenny-backports;
+    lenny-backports-sloppy;
+    squeeze-backports;
+  };
+}