Merged from debian branch

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

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 9759a26..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,8 +22,7 @@ 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";
 
 # Echelon
@@ -34,7 +39,7 @@ 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";
@@ -60,4 +65,4 @@ authtokenpath = "/var/cache/userdir-ldap/web-cookies";
 countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # Finger daemon settings
-use_inetd = 0;
+# use_inetd = 1;