projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document how to use unique overlay for uid and keyFingerPrint
[mirror/userdir-ldap.git]
/
ud-replicate
diff --git
a/ud-replicate
b/ud-replicate
index
f148bf6
..
3601b32
100755
(executable)
--- a/
ud-replicate
+++ b/
ud-replicate
@@
-44,6
+44,7
@@
export PATH
HOST=`hostname -f`
SYNCHOST=`ud-config synchost`;
LOCALSYNCON=`ud-config localsyncon`;
HOST=`hostname -f`
SYNCHOST=`ud-config synchost`;
LOCALSYNCON=`ud-config localsyncon`;
+EMAILAPPEND=`ud-config emailappend`;
cd /tmp/
cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
lockfile -r 1 -l 3600 lock
cd /tmp/
cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
lockfile -r 1 -l 3600 lock
@@
-78,12
+79,10
@@
ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
if [ -e ${HOST}/ssh-keys.tar.gz ]; then
ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
if [ -e ${HOST}/ssh-keys.tar.gz ]; then
- export TMPDIR='/tmp/'
+ export TMPDIR='/tmp/'
tempdir=$(mktemp -d)
tempdir=$(mktemp -d)
- old=$(pwd -P)
- cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz
- cd $old
- mkdir userkeys 2> /dev/null || true
+ tar -C "$tempdir" -xf ${HOST}/ssh-keys.tar.gz
+ mkdir -p userkeys
chmod 755 $tempdir
rsync -a --delete-after $tempdir/ userkeys/
fi
chmod 755 $tempdir
rsync -a --delete-after $tempdir/ userkeys/
fi
@@
-122,6
+121,6
@@
if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then
fi
fi
if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
fi
fi
if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
- sed -e
's/:/@debian.org/'
$HOST/forward-alias > /etc/postfix/debian
+ sed -e
"s/:/@$EMAILAPPEND/"
$HOST/forward-alias > /etc/postfix/debian
/usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
fi
/usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
fi