Remove more unused values

[dak.git] / config / debian-security / dak.conf

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 21e1768995ae4d4cc5a1ebfc9aab56e7fb25c052..8ef7060f7104961280681640b348c9ce90f2ec84 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -31,9 +31,10 @@ Dinstall
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
    DefaultSuite "stable";
-   SuiteSuffix "updates";
+   SuiteSuffix "updates/";
    OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
+   AllowSourceOnlyUploads "true";
 };
 
 Process-New
@@ -46,7 +47,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 +61,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";
@@ -150,7 +143,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Stable
+  OldStable
   {
        Components 
        {
@@ -169,7 +162,7 @@ Suite
        CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
        Components
        {
@@ -181,12 +174,31 @@ Suite
        Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian testing Security Updates";
+       Description "Debian 6.0 Security Updates";
        ValidTime 864000; // 10 days
        CodeName "squeeze";
        OverrideCodeName "squeeze";
        CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
+
+  Testing
+  {
+       Components
+       {
+         updates/main;
+         updates/contrib;
+         updates/non-free;
+       };
+       Announce "dak@security.debian.org";
+       Version "";
+       Origin "Debian";
+       Label "Debian-Security";
+       Description "Debian testing Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "wheezy";
+       OverrideCodeName "wheezy";
+       CopyDotDak "/srv/security-master.debian.org/queue/done/";
+  };
 };
 
 SuiteMappings
@@ -198,12 +210,16 @@ 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/";
@@ -213,10 +229,10 @@ Dir
   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";
   Queue
   {
     Byhand "/srv/security-master.debian.org/queue/byhand/";
@@ -227,8 +243,8 @@ Dir
     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/";
@@ -238,10 +254,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
@@ -278,29 +297,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";
@@ -377,28 +373,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";
@@ -411,3 +385,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;
+  };
+}