X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.conf;h=ce77700dff4a1f1d1ac7f5ef5908f771b91c931e;hb=de6be72a0f8c50acaf83a9111f0bd3901e5eac1c;hp=cb4a5cb4e6eeba7d2ff259582fdbb068b4c72392;hpb=15a4da25cda1e33ccc1d951dc21f24380c6a2239;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index cb4a5cb..ce77700 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -10,9 +10,13 @@ localsyncon = "*draghi*";
 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";
 
@@ -30,6 +34,9 @@ replaycachefile = "/var/cache/userdir-ldap/mail/replay";
 #replaycachefile = "/tmp/replay";
 fingerprintfile = "/etc/userdir-ldap/badfingerprints"
 
+# do we have a debian-private like list that we should ask about in ud-useradd
+haveprivatelist = True;
+
 # Echelon
 ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log"
 ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
@@ -46,11 +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:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
+keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/removed-keys.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/org/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:/org/keyring.debian.org/keyrings/debian-maintainers.gpg"
+sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/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:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"
+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"
 
 # For the WEB interface
 webloginhtml = "login.html";
@@ -77,3 +85,8 @@ 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."]}'