X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.conf;h=ad37d9dbd3beb6abe4902ddbbb912d7c497c0f66;hb=595923978a9ad55f4ec55b1aabef44683b111911;hp=98a4c28ebea8fdca723721306cf1522b8416eccb;hpb=88a19a6e47a1c577474311d016ae5d26a72a4029;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 98a4c28..ad37d9d 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -8,6 +8,7 @@ localsyncon = "*samosa*";
 
 # Basic LDAP configuration
 ldaphost = "db.debian.org";
+usessl   = True;
 basedn   = "ou=users,dc=debian,dc=org";
 hostbasedn = "ou=hosts,dc=debian,dc=org";
 adminuser = "admin";
@@ -42,7 +43,12 @@ passdir = "/etc/userdir-ldap/";
 
 # 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:/home/jgg/keys/extrakeys.gpg:/home/jgg/keys/guest-keys.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";
+# Keyrings used to search in when new developers get added
+add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
 
 # For the WEB interface
 webloginhtml = "login.html";