projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-mailgate: use subprocess.Popen instead of os.popen.
[mirror/userdir-ldap.git]
/
userdir-ldap.conf
diff --git
a/userdir-ldap.conf
b/userdir-ldap.conf
index
64423d8
..
1d71045
100644
(file)
--- 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";
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";
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";
# 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"
# Domain for hosts, defaults to emailappend if not present
#hostdomain = "debian.org"
@@
-34,11
+41,8
@@
fingerprintfile = "/etc/userdir-ldap/badfingerprints"
haveprivatelist = True;
# Echelon
haveprivatelist = True;
# Echelon
-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;
+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/";
# For the output generator
generatedir = "/var/cache/userdir-ldap/hosts/";
@@
-49,11
+53,12
@@
homeprefix = "/home/";
# GPG Things
gpg = "/usr/bin/gpg";
# The whole set of all keyrings
# 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 = "/
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
# 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 = "/
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
# 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 = "/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";
# For the WEB interface
webloginhtml = "login.html";
@@
-61,6
+66,7
@@
websearchhtml = "searchform.html";
websearchresulthtml = "searchresults.html";
webupdatehtml = "update.html";
hosthtml = "hostinfo.html";
websearchresulthtml = "searchresults.html";
webupdatehtml = "update.html";
hosthtml = "hostinfo.html";
+webuilocation = "https://db.debian.org";
webloginurl = "login.cgi";
websearchurl = "search.cgi";
webloginurl = "login.cgi";
websearchurl = "search.cgi";
@@
-71,6
+77,9
@@
weblogfile = "/var/log/userldap-web.log";
# When should authentication tokens expire?
authexpires = 600;
# 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;
# How many bytes to use for the blowfish key (max = 56 (448 bits))
blowfishkeylen = 10;
@@
-83,3
+92,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$"
# 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;