X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=userdir-ldap.conf;h=1d7104554f3d2035304aac35360f86ed3ba8ffe9;hp=e2242fbfc29e6bf872129b3bd9cc3118ed6a1bc8;hb=HEAD;hpb=4fd32bdec2bfb416412bc98c27bfddd745538623

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index e2242fb..1d71045 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -41,8 +41,8 @@ fingerprintfile = "/etc/userdir-ldap/badfingerprints"
 haveprivatelist = True;
 
 # Echelon
-ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log"
-ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
+ech_errorlog = "/srv/db.debian.org/mail/Log/ech-errors.log"
+ech_mainlog = "/srv/db.debian.org/mail/Log/ech.log"
 
 # For the output generator
 generatedir = "/var/cache/userdir-ldap/hosts/";
@@ -53,12 +53,12 @@ homeprefix = "/home/";
 # GPG Things
 gpg = "/usr/bin/gpg";
 # The whole set of all keyrings
-keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
+keyrings = "/srv/keyring.debian.org/keyrings/debian-keyring.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"
 # Keyrings synced to other machines, if they need them
-sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
+sync_keyrings = "/srv/keyring.debian.org/keyrings/debian-keyring.gpg:/srv/keyring.debian.org/keyrings/debian-maintainers.gpg"
 # Keyrings used to search in when new developers get added
-add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg"
-add_keyrings_guest = "/org/keyring.debian.org/keyrings/debian-maintainers.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"
+add_keyrings = "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"
+add_keyrings_guest = "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"
 
 # For the WEB interface
 webloginhtml = "login.html";
@@ -66,6 +66,7 @@ websearchhtml = "searchform.html";
 websearchresulthtml = "searchresults.html";
 webupdatehtml = "update.html";
 hosthtml = "hostinfo.html";
+webuilocation = "https://db.debian.org";
 
 webloginurl = "login.cgi";
 websearchurl = "search.cgi";
@@ -76,6 +77,9 @@ weblogfile = "/var/log/userldap-web.log";
 # When should authentication tokens expire?
 authexpires = 600;
 
+# Where should totp tickets be stored while waiting for pickup?
+totpticketdirectory = "/var/cache/userdir-ldap/totp";
+
 # How many bytes to use for the blowfish key (max = 56 (448 bits))
 blowfishkeylen = 10;