X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.conf;h=5b66fd09ff6de3fbfdaecbaeb99935084a795fe3;hb=01bbfdac62242c9dcb6d77cd2f71f6819e731cb3;hp=64423d8981f8990e01cec903b986c2bc2dc6d745;hpb=e98aa810efeea1da3ac4c2f547b661674968c2f9;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 64423d8..5b66fd0 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -10,6 +10,7 @@ localsyncon = "*draghi*";
 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";
 
@@ -49,11 +50,12 @@ 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/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
-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
-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";