Add option to specify CAs to trust for LDAP connection over TLS

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index a14cd80beb1791c76f18e314367b699fc50b9ae4..2954c595bfdee407ee0b51b1830b6ff273167c2b 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -12,8 +12,6 @@ Dinstall
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
    Bcc "archive@ftp-master.debian.org";
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 300;
    BXANotify "true";
    CloseBugs "true";
@@ -99,6 +97,7 @@ Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
+  CACertFile "/etc/ssl/certs/spi-cacert-2008.pem";
   ExtraKeyrings
   {
     "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
@@ -250,6 +249,13 @@ SuiteMappings
 };
 
 AutomaticByHandPackages {
+  "debian-faq" {
+    Source "debian-faq";
+    Section "byhand";
+    Extension "gz";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-debian-faq";
+  };
+
   "debian-installer-images" {
     Source "debian-installer";
     Section "raw-installer";