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

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index b61d1f4..ad37d9d 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";
@@ -16,8 +23,13 @@ pingfrom = "ping@" + maildomain;
 chpassfrom = "chpasswd@" + maildomain;
 changefrom = "change@" + maildomain;
 templatesdir = "/etc/userdir-ldap/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"
+ech_mainlog = "/org/db.debian.org/mail/Log/ech.log"
 
 # User properties
 defaultgid = 800;
@@ -25,12 +37,18 @@ defaultgid = 800;
 # For the output generator
 generateconf = "/etc/userdir-ldap/generate.conf"
 generatedir = "/var/cache/userdir-ldap/hosts/";
-#generatedir = "/tmp/hosts";
+singlesshfile = True
+multiplesshfiles = False
 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";
@@ -43,7 +61,7 @@ webloginurl = "login.cgi";
 websearchurl = "search.cgi";
 webupdateurl = "update.cgi";
 
-weblogfile = '/var/log/userldap-web.log';
+weblogfile = "/var/log/userldap-web.log";
 
 # When should authentication tokens expire?
 authexpires = 600;
@@ -56,4 +74,4 @@ authtokenpath = "/var/cache/userdir-ldap/web-cookies";
 countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # Finger daemon settings
-use_inetd = 0;
+# use_inetd = 1;