[Da-tools-commits] ./debian/userdir-ldap r370: Merge from alioth

[Peter Palfrader]

------------------------------------------------------------
revno: 370
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:43:33 +0100
message:
  Merge from alioth
  
  But fix ud-replicate to use `$LOCALSYNCON' instead of `*$LOCALSYNCON*' in the case statement.
modified:
  debian/changelog
  ud-replicate
  userdir-ldap.conf
    ------------------------------------------------------------
    revno: 349.1.14
    committer: Marc 'HE' Brockschmidt <he at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Thu 2007-12-27 17:17:13 +0100
    message:
      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
    modified:
      debian/changelog
      ud-replicate
      userdir-ldap.conf
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-01-10 14:35:18 +0000
+++ b/debian/changelog	2008-01-10 14:43:33 +0000
@@ -37,7 +37,14 @@
   * add simple ud-config script for use in shell scripts.  This allows
     querying config values.
 
- -- Peter Palfrader <weasel at 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 at debian.org>  Thu, 27 Dec 2007 17:14:51 +0100
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

=== modified file 'ud-replicate'
--- a/ud-replicate	2006-12-29 00:36:56 +0000
+++ b/ud-replicate	2008-01-10 14:43:33 +0000
@@ -31,17 +31,19 @@
 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 at db:"
+    udhost="sshdist@$SYNCHOST:"
     ;;
 esac
 

=== modified file 'userdir-ldap.conf'
--- a/userdir-ldap.conf	2004-11-18 15:26:28 +0000
+++ b/userdir-ldap.conf	2007-12-27 16:17:13 +0000
@@ -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";