X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=2d5c7dd6ba5dee4292f1bc9c2b384f9113480e05;hb=1c8207a0b99e557ce6c3d872ace7914d96195102;hp=6eef7119cc389f8a555c52ce9d58b4203a809543;hpb=a7f77393881783e65423f1f36778c67c52e5213d;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6eef7119..2d5c7dd6 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -48,6 +48,7 @@ Generate-Index-Diffs
 Show-New
 {
   HTMLPath "/srv/ftp.debian.org/web/new/";
+  Options::Queue "new,backports-new";
 }
 
 Show-Deferred
@@ -60,7 +61,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser";
+  KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser";
 };
 
 Clean-Queues
@@ -116,7 +117,6 @@ Clean-Suites
 
 Process-New
 {
-  DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock";
   LockDir "/srv/ftp-master.debian.org/lock/new/";
 };
 
@@ -217,19 +217,25 @@ Suite
 
 SuiteMappings
 {
- "reject squeeze-backports";
- "silent-map squeeze-security stable-security";
- "silent-map wheezy-security testing-security";
+ "silent-map squeeze-security oldstable-security";
+ "silent-map wheezy-security stable-security";
+ "silent-map jessie-security testing-security";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map squeeze stable";
- "map squeeze-proposed-updates proposed-updates";
- "map squeeze-updates proposed-updates";
- "map wheezy testing";
- "map wheezy-proposed-updates testing-proposed-updates";
- "map wheezy-updates testing-proposed-updates";
+ "map squeeze oldstable";
+ "map squeeze-proposed-updates oldstable-proposed-updates";
+ "map squeeze-updates oldstable-proposed-updates";
+ "map wheezy stable";
+ "map wheezy-proposed-updates proposed-updates";
+ "map wheezy-updates proposed-updates";
+ "map jessie testing";
+ "map jessie-proposed-updates testing-proposed-updates";
+ "map jessie-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
+ "map oldstable oldstable-proposed-updates";
+ "map oldstable-security oldstable-proposed-updates";
+ "map oldstable-updates oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
@@ -278,7 +284,6 @@ Dir
   Root "/srv/ftp-master.debian.org/ftp/";
   Pool "/srv/ftp-master.debian.org/ftp/pool/";
   Templates "/srv/ftp-master.debian.org/dak/templates/";
-  Export "/srv/ftp-master.debian.org/export/";
   Lists "/srv/ftp-master.debian.org/database/dists/";
   Cache "/srv/ftp-master.debian.org/database/";
   Log "/srv/ftp-master.debian.org/log/";
@@ -379,7 +384,7 @@ Generate-Releases
 }
 
 ByGroup {
-  dak "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak";
+  dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak";
   ftpteam "";
   backports "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-backports";
 };