projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import from samosa: Various changes from James
[mirror/userdir-ldap.git]
/
ud-replicate
diff --git
a/ud-replicate
b/ud-replicate
index
2df3980
..
8968aa1
100755
(executable)
--- a/
ud-replicate
+++ b/
ud-replicate
@@
-2,14
+2,25
@@
# The rsync source host needs to be customized..
set -e
# The rsync source host needs to be customized..
set -e
-exec > /dev/null 2>&1
+# Without effect on the commandline
+if [ -z "$PS1" -o "$TERM" ]
+then
+ exec > /dev/null 2>&1
+ verbose=-v
+fi
HOST=`hostname -f`
cd /tmp/
cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
lockfile -r 1 -l 3600 lock
trap "rm -f lock" exit
HOST=`hostname -f`
cd /tmp/
cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
lockfile -r 1 -l 3600 lock
trap "rm -f lock" exit
-rsync -e ssh -rp "sshdist@samosa:/var/cache/userdir-ldap/hosts/$HOST" .
+case $HOST in
+*samosa*)
+ udhost=;;
+*)
+ udhost="sshdist@samosa:";;
+esac
+rsync ${verbose} -e ssh -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
makedb "$HOST/passwd.tdb" -o passwd.db.t
(umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
chown root.shadow shadow.db.t; chmod 0640 shadow.db.t
makedb "$HOST/passwd.tdb" -o passwd.db.t
(umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
chown root.shadow shadow.db.t; chmod 0640 shadow.db.t
@@
-34,8
+45,12
@@
mv -f group.db.t group.db
#fi
ln -sf "$HOST/ssh-rsa-shadow" .
ln -sf "$HOST/ssh_known_hosts" .
#fi
ln -sf "$HOST/ssh-rsa-shadow" .
ln -sf "$HOST/ssh_known_hosts" .
-if [ -e "$HOST/bsmtp" ]; then
+if [ -
d "/etc/exim" -a -
e "$HOST/bsmtp" ]; then
if perl -e 'exit !((stat "/etc/exim/bsmtp")[9] < time()-3600)'; then
cp "$HOST/bsmtp" /etc/exim/bsmtp
fi
fi
if perl -e 'exit !((stat "/etc/exim/bsmtp")[9] < time()-3600)'; then
cp "$HOST/bsmtp" /etc/exim/bsmtp
fi
fi
+if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
+ sed -e 's/:/@debian.org/' $HOST/forward-alias > /etc/postfix/debian
+ /usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
+fi