X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.conf;h=3c45fe343c0235d9d7f41e1c6b469a6d7591d2d2;hb=eb3223d5f08ccd7cf9594a1f2f60fd2e75773413;hp=3ace1f05479755130e08b129411d38b3218b6dd7;hpb=66a6c764a7d4587d5c472a717c79b6954aea2466;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 3ace1f0..3c45fe3 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -4,7 +4,7 @@
 # host from which to rsync the information (the one running ud-generate)
 synchost = "db";
 # hosts on which to use a local path to get the data (used as a shell glob later)
-localsyncon = "*samosa*";
+localsyncon = "*draghi*";
 
 # Basic LDAP configuration
 ldaphost = "db.debian.org";
@@ -30,6 +30,9 @@ replaycachefile = "/var/cache/userdir-ldap/mail/replay";
 #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"
@@ -38,18 +41,20 @@ ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
 defaultgid = 800;
 
 # For the output generator
-generateconf = "/etc/userdir-ldap/generate.conf"
 generatedir = "/var/cache/userdir-ldap/hosts/";
 passdir = "/etc/userdir-ldap/";
+allowedgroupspreload = "adm";
+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"
+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"
+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"
+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";
@@ -76,3 +81,6 @@ countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # Finger daemon settings
 # use_inetd = 1;
+
+# only create sshfp and A records for hostnames matching this:
+dns_hostmatch = "[a-zA-Z0-9\.]+\.debian\.org$"