From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Jan 2008 14:43:33 +0000 (+0100)
Subject: Merge from alioth
X-Git-Tag: userdir-ldap-0.3.16~12
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e9ceda5a3cb74ea520cbb056559f709f3d85e86d;hp=50ca566cb78d2f283ac8de7a7ace2c8e236375b7;p=mirror%2Fuserdir-ldap.git

Merge from alioth

But fix ud-replicate to use `$LOCALSYNCON' instead of `*$LOCALSYNCON*' in the case statement.
---

diff --git a/debian/changelog b/debian/changelog
index 0459844..7ad7d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,7 +37,14 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
   * add simple ud-config script for use in shell scripts.  This allows
     querying config values.
 
- -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:34:46 +0100
+  [ Marc 'HE' Brockschmidt ]
+  * Make the host ud-replicate syncs from configurable in userdir-ldap.conf,
+    instead of hardcoding it into the script. Also introduce a variable
+    containing a shell glob on which no remote sync is needed, so that
+    the db host doesn't need to have a key in the authorized_keys file
+    for the sshdist user
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Thu, 27 Dec 2007 17:14:51 +0100
 
 userdir-ldap (0.3.15) unstable; urgency=low
 
diff --git a/ud-replicate b/ud-replicate
index 1a0ca55..0c17297 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -31,17 +31,19 @@ fi
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 export PATH
 HOST=`hostname -f`
+SYNCHOST=`ud-config synchost`;
+LOCALSYNCON=`ud-config localsyncon`;
 cd /tmp/
 cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
 lockfile -r 1 -l 3600 lock
 trap "rm -f lock" exit
 
 case $HOST in
-*samosa*)
+$LOCALSYNCON)
     udhost=
     ;;
 *)
-    udhost="sshdist@db:"
+    udhost="sshdist@$SYNCHOST:"
     ;;
 esac
 
diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 9094bd8..048e907 100644
--- 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";