Merged from debian branch

[mirror/userdir-ldap.git] / userdir-ldap.conf

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index ccdc89b..048e907 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -1,5 +1,11 @@
 # 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";
 basedn   = "ou=users,dc=debian,dc=org";
@@ -16,21 +22,24 @@ 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";
 
+# 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;
 
 # For the output generator
 generateconf = "/etc/userdir-ldap/generate.conf"
 generatedir = "/var/cache/userdir-ldap/hosts/";
-#generatedir = "/tmp/hosts";
 passdir = "/etc/userdir-ldap/";
 
 # GPG Things
 gpg = "/usr/bin/gpg";
-keyrings = "/usr/share/keyrings/debian-keyring.gpg:/usr/share/keyrings/debian-keyring.pgp";
+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";
 
 # For the WEB interface
 webloginhtml = "login.html";
@@ -43,6 +52,8 @@ webloginurl = "login.cgi";
 websearchurl = "search.cgi";
 webupdateurl = "update.cgi";
 
+weblogfile = "/var/log/userldap-web.log";
+
 # When should authentication tokens expire?
 authexpires = 600;
 
@@ -54,4 +65,4 @@ authtokenpath = "/var/cache/userdir-ldap/web-cookies";
 countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # Finger daemon settings
-#use_inetd = 1;
+# use_inetd = 1;