projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update guest welcome template
[mirror/userdir-ldap.git]
/
userdir-ldap.conf
diff --git
a/userdir-ldap.conf
b/userdir-ldap.conf
index
cb4a5cb
..
3c45fe3
100644
(file)
--- a/
userdir-ldap.conf
+++ b/
userdir-ldap.conf
@@
-30,6
+30,9
@@
replaycachefile = "/var/cache/userdir-ldap/mail/replay";
#replaycachefile = "/tmp/replay";
fingerprintfile = "/etc/userdir-ldap/badfingerprints"
#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"
# Echelon
ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log"
ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
@@
-46,11
+49,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 = "/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
# 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
# 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";
# For the WEB interface
webloginhtml = "login.html";
@@
-77,3
+81,6
@@
countrylist = "/var/www/userdir-ldap/domains.tab";
# Finger daemon settings
# use_inetd = 1;
# Finger daemon settings
# use_inetd = 1;
+
+# only create sshfp and A records for hostnames matching this:
+dns_hostmatch = "[a-zA-Z0-9\.]+\.debian\.org$"