X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=aa729c37675f667200cda973df0337ecd2921b95;hb=5229fa5525b627414d96fe11b8f6853d3d58d29e;hp=4acfa1760d7748785f3c30755614aa500bc0bb98;hpb=6cb0b0401eaeeb6900551c20617f0a8f2293cd89;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 4acfa176..aa729c37 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,8 +1,5 @@
 Dinstall
 {
-   GPGKeyring {
-     "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-   };
    // was non-us.d.o path before
    SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
@@ -14,7 +11,6 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security-master.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -23,17 +19,11 @@ Dinstall
    CloseBugs "false";
    OverrideDisparityCheck "false";
    BXANotify "false";
-   QueueBuildSuites
-   {
-     stable;
-     testing;
-   };
-   SecurityQueueHandling "true";     
-   SecurityQueueBuild "true";     
    DefaultSuite "stable";
-   SuiteSuffix "updates";
+   SuiteSuffix "updates/";
    OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
+   AllowSourceOnlyUploads "true";
 };
 
 Process-New
@@ -46,7 +36,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,www-data,udmsearch";
+  KnownPostgres "postgres,dak,www-data,udmsearch,repuser";
 };
 
 Queue-Report
@@ -60,14 +50,6 @@ Queue-Report
   };
 };
 
-Import-Keyring
-{
-  /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-    {
-      Debian-Maintainer "true";
-    };
-};
-
 Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
@@ -118,16 +100,10 @@ Rm
   LogFile "/srv/security-master.debian.org/dak-log/removals.txt";
 };
 
-Init-Archive
-{
-  ExportDir "/srv/security-master.debian.org/dak/import-archive-files/";
-};
-
 Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
-  QueueBuildStayOfExecution 86400; // 24 hours
   MorgueSubDir "pool";
   OverrideFilename "override.source-only";
 };
@@ -217,37 +193,40 @@ SuiteMappings
   "silent-map etch-secure oldstable";
   "silent-map lenny-secure stable";
   "silent-map testing-security testing";
+  "silent-map lenny-security oldstable";
+  "silent-map squeeze-security stable";
+  "silent-map wheezy-security testing";
 };
 
 Dir
 {
   Root "/srv/security-master.debian.org/ftp/";
   Pool "/srv/security-master.debian.org/ftp/pool/";
+  Export "/srv/security-master.debian.org/export/";
   Dak "/srv/security-master.debian.org/dak/";
   Templates "/srv/security-master.debian.org/dak/templates/";
-  PoolRoot "pool/";
   Override "/srv/security-master.debian.org/override/";
   Lock "/srv/security-master.debian.org/lock/";
   Cache "/srv/security-master.debian.org/database/";
   Lists "/srv/security-master.debian.org/dak-database/dists/";
   Log "/srv/security-master.debian.org/dak-log/";
   Morgue "/srv/security-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/security-master.debian.org/scripts/override/";
-  QueueBuild "/srv/security-master.debian.org/buildd/";
   Upload "/srv/queued/ftpmaster/";
+  TempPath "/srv/security-master.debian.org/tmp";
+  Holding "/srv/security-master.debian.org/queue/holding/";
+  Done "/srv/security-master.debian.org/queue/done/";
+  Reject "/srv/security-master.debian.org/queue/reject/";
+
   Queue
   {
     Byhand "/srv/security-master.debian.org/queue/byhand/";
-    Done "/srv/security-master.debian.org/queue/done/";
-    Holding "/srv/security-master.debian.org/queue/holding/";
     New "/srv/security-master.debian.org/queue/new/";
-    Reject "/srv/security-master.debian.org/queue/reject/";
     Unchecked "/srv/security-master.debian.org/queue/unchecked/";
     Newstage "/srv/security-master.debian.org/queue/newstage/";
 
-    ProposedUpdates "/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/does/not/exist/"; // XXX fixme
+    ProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
 
     Embargoed "/srv/security-master.debian.org/queue/embargoed/";
     Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";
@@ -257,10 +236,13 @@ Dir
 
 DB
 {
-  Name "obscurity";
-  Host ""; 
-  Port -1;
-
+  Service "obscurity";
+  // 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"
 };
 
 Architectures
@@ -297,29 +279,6 @@ Archive
 
 };
 
-Component
-{
-
-  updates/main
-  {
-	Description "Main (updates)";
-	MeetsDFSG "true";
-  };
-
-  updates/contrib
-  {
-	Description "Contrib (updates)";
-	MeetsDFSG "true";
-  };
-
-  updates/non-free
-  {
-	Description "Software that fails to meet the DFSG";
-	MeetsDFSG "false";
-  };
-
-};
-
 ComponentMappings
 {
  "main updates/main";
@@ -396,28 +355,6 @@ Priority
   source 0; // i.e. unused
 };
 
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
-Location
-{
-  /srv/security-master.debian.org/ftp/pool/
-    {
-      Archive "security";
-      Suites 
-	{
-	  OldStable;
-	  Stable;
-	  Testing;
-        };
-      Type "pool";
-    };
-};
-
 Urgency
 {
   Default "low";
@@ -430,3 +367,30 @@ Urgency
     critical;
   };
 };
+
+Changelogs
+{
+  Export "/srv/security-master.debian.org/export/changelogs";
+}
+
+Generate-Releases
+{
+  MD5Sum
+  {
+    oldstable;
+    stable;
+    testing;
+  };
+  SHA1
+  {
+    oldstable;
+    stable;
+    testing;
+  };
+  SHA256
+  {
+    oldstable;
+    stable;
+    testing;
+  };
+}