Remove more changelog-related settings

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index c8c642f5ec56c031ff957d128a9fe6b9c46ff24b..7e3f932d658ae55a900f995db4ce52cb31d1031f 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -59,7 +59,7 @@ Show-Deferred
 
 Import-Users-From-Passwd
 {
-  ValidGID "800";
+  ValidGID "Debian";
   // Comma separated list of users who are in Postgres but not the passwd file
   KnownPostgres "postgres,dak,dak-unpriv,katie,release,qa,www-data,guest,repuser,debian-backup";
 };
@@ -99,7 +99,7 @@ Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
-  CACertFile "/etc/ssl/servicecerts/db.debian.org.crt";
+  CACertFile "/etc/ssl/ca-debian/ca-certificates.crt";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -221,7 +221,6 @@ Dir
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
   BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
-  Holding "/srv/ftp-master.debian.org/queue/holding/";
   Done "/srv/ftp-master.debian.org/queue/done/";
   Reject "/srv/ftp-master.debian.org/queue/reject/";
 };
@@ -270,13 +269,6 @@ Common
   ThreadCount 16;
 }
 
-Changelogs
-{
-  Testing "/srv/release.debian.org/tools/trille/current-testing";
-  Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
-  Export "/srv/ftp-master.debian.org/export/changelogs";
-}
-
 ByGroup {
   dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak";
   ftpteam "";