userdir_gpg.py: add a ClearKeyrings()

[mirror/userdir-ldap.git] / userdir-ldap.conf

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 975f341..e83995a 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -16,6 +16,9 @@ adminuser = "admin";
 # Printable email addresses are shown as: 'cn mn sn <uid@emailappend>'
 emailappend = "debian.org";
 
+# Domain for hosts, defaults to emailappend if not present
+#hostdomain = "debian.org"
+
 # For the mail interface
 maildomain = "db.debian.org";
 replyto = "admin@" + maildomain;
@@ -46,7 +49,7 @@ keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.deb
 # 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";
 # Keyrings used to search in when new developers get added
-add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
 
 # For the WEB interface
 webloginhtml = "login.html";