X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=userdir-ldap.conf;h=ea9d2acd5cb6db1e95da178f4269561360b41a66;hp=64423d8981f8990e01cec903b986c2bc2dc6d745;hb=877570fc9e292e0c9df0bd5581f4bd9e14f2d6f9;hpb=e98aa810efeea1da3ac4c2f547b661674968c2f9

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 64423d8..ea9d2ac 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -10,12 +10,19 @@ 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";
 
+rtc_realm = "rtc.debian.org";
+rtc_append = "@debian.org";
+
 # Domain for hosts, defaults to emailappend if not present
 #hostdomain = "debian.org"
 
@@ -37,9 +44,6 @@ haveprivatelist = True;
 ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log"
 ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
 
-# User properties
-defaultgid = 800;
-
 # For the output generator
 generatedir = "/var/cache/userdir-ldap/hosts/";
 passdir = "/etc/userdir-ldap/";
@@ -49,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";
@@ -83,3 +88,8 @@ countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # 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;