merge local changes from draghi: localsyncon = "*draghi*" and database hdb

diff --git a/debian/changelog b/debian/changelog
index 58c000c..4353094 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userdir-ldap (0.3.67+XY) unstable; urgency=low
+
+  * userdir-ldap.conf: localsyncon = "*draghi*"
+  * userdir-ldap-slapd.conf.in: database hdb
+
+ -- Peter Palfrader <weasel@debian.org>  Tue, 14 Jul 2009 11:06:51 +0200
+
 userdir-ldap (0.3.67) unstable; urgency=low
 
   [ Stephen Gran ]

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index f586e39..72433f0 100644 (file)
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -1,5 +1,5 @@
 # The backend type, ldbm, is the default standard
-database bdb
+database hdb
 
 # The base of your directory
 suffix          "@@DN@@"

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index f262529..3fff7cf 100644 (file)
--- 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 = "*notanymoretheoldbdhostsamosasamosa*";
+localsyncon = "*draghi*";
 
 # Basic LDAP configuration
 ldaphost = "db.debian.org";
@@ -45,11 +45,11 @@ passdir = "/etc/userdir-ldap/";
 # 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/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.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:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
+add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg"
 
 # For the WEB interface
 webloginhtml = "login.html";