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

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index f262529..1d71045 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -4,18 +4,25 @@
 # host from which to rsync the information (the one running ud-generate)
 synchost = "db";
 # hosts on which to use a local path to get the data (used as a shell glob later)
-localsyncon = "*notanymoretheoldbdhostsamosasamosa*";
+localsyncon = "*draghi*";
 
 # Basic LDAP configuration
 ldaphost = "db.debian.org";
 usessl   = True;
 basedn   = "ou=users,dc=debian,dc=org";
+basebasedn = "dc=debian,dc=org";
 hostbasedn = "ou=hosts,dc=debian,dc=org";
 adminuser = "admin";
 
+#import re
+#ignoreusersforuidnumbergen = ['nobody', re.compile('\$$') ]
+
 # Printable email addresses are shown as: 'cn mn sn <uid@emailappend>'
 emailappend = "debian.org";
 
+rtc_realm = "rtc.debian.org";
+rtc_append = "@debian.org";
+
 # Domain for hosts, defaults to emailappend if not present
 #hostdomain = "debian.org"
 
@@ -30,26 +37,28 @@ replaycachefile = "/var/cache/userdir-ldap/mail/replay";
 #replaycachefile = "/tmp/replay";
 fingerprintfile = "/etc/userdir-ldap/badfingerprints"
 
-# Echelon
-ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log"
-ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
+# do we have a debian-private like list that we should ask about in ud-useradd
+haveprivatelist = True;
 
-# User properties
-defaultgid = 800;
+# Echelon
+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
-generateconf = "/etc/userdir-ldap/generate.conf"
 generatedir = "/var/cache/userdir-ldap/hosts/";
 passdir = "/etc/userdir-ldap/";
+allowedgroupspreload = "adm";
+homeprefix = "/home/";
 
 # GPG Things
 gpg = "/usr/bin/gpg";
 # The whole set of all keyrings
-keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp"
+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-keyring.pgp"
+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:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
+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";
@@ -57,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";
@@ -67,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;
 
@@ -76,3 +89,11 @@ countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # Finger daemon settings
 # use_inetd = 1;
+
+# only create sshfp and A records for hostnames matching this:
+dns_hostmatch = "[a-zA-Z0-9\.]+\.debian\.org$"
+
+MX_remap = '{"0 INCOMING-MX": ["10 mailly.debian.org.", "10 merikanto.debian.org.", "10 muffat.debian.org."]}'
+
+# MQ notification
+use_mq = True;