X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=userdir-ldap.conf;h=42ffb495fc503096344c12d7a30a089e5077e8ad;hb=4f471180cc08e40c19d907892fc2102c43fecd49;hp=9759a2617a017b0f469fb4ef2973d0f6ce3e3a76;hpb=da220ff14d1cfc33e6606875a5260b8c73d00558;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 9759a26..42ffb49 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -1,7 +1,14 @@
 # Config file for ldap scripts
 
+# ud-replicate client configuration:
+# 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*";
+
 # 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";
@@ -9,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;
@@ -16,9 +26,9 @@ pingfrom = "ping@" + maildomain;
 chpassfrom = "chpasswd@" + maildomain;
 changefrom = "change@" + maildomain;
 templatesdir = "/etc/userdir-ldap/templates/";
-#templatesdir = "./templates/";
-replaycachefile = "/var/cache/userdir-ldap/replay";
+replaycachefile = "/var/cache/userdir-ldap/mail/replay";
 #replaycachefile = "/tmp/replay";
+fingerprintfile = "/etc/userdir-ldap/badfingerprints"
 
 # Echelon
 ech_errorlog = "/org/db.debian.org/mail/Log/ech-errors.log"
@@ -34,7 +44,12 @@ passdir = "/etc/userdir-ldap/";
 
 # GPG Things
 gpg = "/usr/bin/gpg";
-keyrings = "/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-keyring.pgp";
+# 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";
@@ -60,4 +75,4 @@ authtokenpath = "/var/cache/userdir-ldap/web-cookies";
 countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # Finger daemon settings
-use_inetd = 0;
+# use_inetd = 1;