X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fdak.conf;h=10213e592cb03383efd0ff1bd7c1f6f5d6ecdb43;hb=72071ba319833252534fc95f275fe30e5392e19e;hp=12ee2a189877dcbd711916561cf2ac0a449aaa78;hpb=19ffc1de995fd165d9438a8b7769cd7c45bbce60;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 12ee2a18..10213e59 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -36,7 +36,7 @@ Process-Policy
 
 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,www-data,udmsearch,repuser,debian-backup";
 };
@@ -56,7 +56,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";
@@ -108,19 +108,6 @@ Clean-Suites
   MorgueSubDir "pool";
 };
 
-Security-Install
-{
-  ComponentMappings
-  {
-    main "ftp-master.debian.org:/pub/UploadQueue";
-    contrib "ftp-master.debian.org:/pub/UploadQueue";
-    non-free "ftp-master.debian.org:/pub/UploadQueue";
-    non-US/main "non-us.debian.org:/pub/UploadQueue";
-    non-US/contrib "non-us.debian.org:/pub/UploadQueue";
-    non-US/non-free "non-us.debian.org:/pub/UploadQueue";
-  };
-};
-
 SuiteMappings
 {
  "silent-map stable-security stable";
@@ -154,7 +141,6 @@ Dir
   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/";
 
@@ -182,9 +168,6 @@ ComponentMappings
  "main updates/main";
  "contrib updates/contrib";
  "non-free updates/non-free";
- "non-US/main updates/main";
- "non-US/contrib updates/contrib";
- "non-US/non-free updates/non-free";
 };
 
 Urgency
@@ -199,3 +182,8 @@ Urgency
     critical;
   };
 };
+
+Changelogs
+{
+  Export "/srv/security-master.debian.org/export/changelogs";
+};