]> git.decadent.org.uk Git - dak.git/blobdiff - config/debian-security/dak.conf
remove lenny
[dak.git] / config / debian-security / dak.conf
index ade76eef359203e904d2ff1ce9ed077ed7fc3ce8..c5ad1ca1ca4bcb2cb36a3096a353c10e831a6ce6 100644 (file)
@@ -1,20 +1,16 @@
 Dinstall
 {
-   GPGKeyring {
-     "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
-     "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   };
-   SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
-   SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "6070D3A1";
+   // 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";
+   SigningKeyIds "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
-   MyEmailAddress "Debian Installer <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
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -23,39 +19,64 @@ Dinstall
    CloseBugs "false";
    OverrideDisparityCheck "false";
    BXANotify "false";
-   QueueBuildSuites
-   {
-     oldstable;
-     stable;
-     testing;
-   };
-   SecurityQueueHandling "true";     
-   SecurityQueueBuild "true";     
    DefaultSuite "stable";
-   SuiteSuffix "updates";
+   SuiteSuffix "updates/";
    OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
+   AllowSourceOnlyUploads "true";
 };
 
 Process-New
 {
-  AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
+  DinstallLockFile "/srv/security-master.debian.org/lock/processnew.lock";
+  LockDir "/srv/security-master.debian.org/lock/new/";
 };
 
 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
 {
   Directories
   {
-    // byhand;
-    // new;
+    byhand;
+    new;
     unembargoed;
+    embargoed;
+  };
+};
+
+Import-LDAP-Fingerprints
+{
+  LDAPDn "ou=users,dc=debian,dc=org";
+  LDAPServer "db.debian.org";
+  ExtraKeyrings
+  {
+    "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
+    "/srv/keyring.debian.org/keyrings/removed-keys.gpg";
+    "/srv/keyring.debian.org/keyrings/extra-keys.pgp";
+  };
+  KeyServer "wwwkeys.eu.pgp.net";
+};
+
+Check-Overrides
+{
+  OverrideSuites
+  {
+    Stable
+    {
+      Process "0";
+    };
+
+    Testing
+    {
+      Process "0";
+    };
+
   };
 };
 
@@ -76,19 +97,13 @@ Rm
   };
 
   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-  LogFile "/org/security.debian.org/dak-log/removals.txt";
-};
-
-Init-Archive
-{
-  ExportDir "/org/security.debian.org/dak/import-archive-files/";
+  LogFile "/srv/security-master.debian.org/dak-log/removals.txt";
 };
 
 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";
 };
@@ -111,28 +126,9 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  OldStable
-  {
-       Components 
-       {
-         updates/main;
-         updates/contrib;
-         updates/non-free;
-       };
-       Announce "dak@security.debian.org";
-       Version "";
-       Origin "Debian";
-       Label "Debian-Security";
-       Description "Debian 4.0 Security Updates";
-       ValidTime 864000; // 10 days
-       CodeName "etch";
-       OverrideCodeName "etch";
-       CopyDotDak "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
-       Components 
+       Components
        {
          updates/main;
          updates/contrib;
@@ -142,11 +138,11 @@ Suite
        Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian 5.0 Security Updates";
+       Description "Debian 6.0 Security Updates";
        ValidTime 864000; // 10 days
-       CodeName "lenny";
-       OverrideCodeName "lenny";
-       CopyDotDak "/org/security.debian.org/queue/done/";
+       CodeName "squeeze";
+       OverrideCodeName "squeeze";
+       CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 
   Testing
@@ -163,9 +159,9 @@ Suite
        Label "Debian-Security";
        Description "Debian testing Security Updates";
        ValidTime 864000; // 10 days
-       CodeName "squeeze";
-       OverrideCodeName "squeeze";
-       CopyDotDak "/org/security.debian.org/queue/done/";
+       CodeName "wheezy";
+       OverrideCodeName "wheezy";
+       CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 };
 
@@ -173,53 +169,57 @@ SuiteMappings
 {
  "silent-map stable-security stable";
  "silent-map oldstable-security oldstable";
- // JT - FIXME, hackorama
- // "silent-map testing-security stable";
   "silent-map etch-secure oldstable";
-  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
+  "silent-map squeeze-security stable";
+  "silent-map wheezy-security testing";
 };
 
 Dir
 {
-  Root "/org/security.debian.org/ftp/";
-  Pool "/org/security.debian.org/ftp/pool/";
-  Dak "/org/security.debian.org/dak/";
-  Templates "/org/security.debian.org/dak/templates/";
-  PoolRoot "pool/";
-  Override "/org/security.debian.org/override/";
-  Lock "/org/security.debian.org/lock/";
-  Lists "/org/security.debian.org/dak-database/dists/";
-  Log "/org/security.debian.org/dak-log/";
-  Morgue "/org/security.debian.org/morgue/";
-  MorgueReject "reject";
-  Override "/org/security.debian.org/scripts/override/";
-  QueueBuild "/org/security.debian.org/buildd/";
-  Upload "/srv/queued/UploadQueue/";
+  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/";
+  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/";
+  Override "/srv/security-master.debian.org/scripts/override/";
+  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
   {
-    Accepted "/org/security.debian.org/queue/accepted/";
-    Byhand "/org/security.debian.org/queue/byhand/";
-    Done "/org/security.debian.org/queue/done/";
-    Holding "/org/security.debian.org/queue/holding/";
-    New "/org/security.debian.org/queue/new/";
-    Reject "/org/security.debian.org/queue/reject/";
-    Unchecked "/org/security.debian.org/queue/unchecked/";
-    ProposedUpdates "/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/does/not/exist/"; // XXX fixme
-
-    Embargoed "/org/security.debian.org/queue/embargoed/";
-    Unembargoed "/org/security.debian.org/queue/unembargoed/";
-    Disembargo "/org/security.debian.org/queue/unchecked-disembargo/";
+    Byhand "/srv/security-master.debian.org/queue/byhand/";
+    New "/srv/security-master.debian.org/queue/new/";
+    Unchecked "/srv/security-master.debian.org/queue/unchecked/";
+    Newstage "/srv/security-master.debian.org/queue/newstage/";
+
+    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/";
+    Disembargo "/srv/security-master.debian.org/queue/unchecked-disembargo/";
   };
 };
 
 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
@@ -239,6 +239,8 @@ Architectures
   s390 "IBM S/390";
   sparc "Sun SPARC/UltraSPARC";
   amd64 "AMD x86_64 (AMD64)";
+  kfreebsd-i386 "GNU/kFreeBSD i386";
+  kfreebsd-amd64 "GNU/kFreeBSD amd64";
 
 };
 
@@ -254,29 +256,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";
@@ -339,6 +318,8 @@ Section
   vcs;
   video;
   x11;
+  xfce;
+  zope;
 };
 
 Priority
@@ -351,28 +332,6 @@ Priority
   source 0; // i.e. unused
 };
 
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
-Location
-{
-  /org/security.debian.org/ftp/pool/
-    {
-      Archive "security";
-      Suites 
-       {
-         OldStable;
-         Stable;
-         Testing;
-        };
-      Type "pool";
-    };
-};
-
 Urgency
 {
   Default "low";
@@ -385,3 +344,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;
+  };
+}