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

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 4efd923..e2242fb 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -20,6 +20,9 @@ adminuser = "admin";
 # 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"
 
@@ -41,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/";
@@ -53,7 +53,7 @@ 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/removed-keys.gpg:/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:/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-maintainers.gpg"
 # Keyrings used to search in when new developers get added
@@ -88,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;