X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=e06776c71fd7dbfabad8a11a49cb123aebdb594d;hb=775666c5b0ea751b6fc5db55b0264612ad116a0b;hp=d8b5f4eb7d53c46e246cc332ce9d47ce588f8be6;hpb=cf96cdff992b8f343e9964ba0385795e14a31497;p=mirror%2Fuserdir-ldap.git diff --git a/ud-replicate b/ud-replicate index d8b5f4e..e06776c 100755 --- a/ud-replicate +++ b/ud-replicate @@ -3,7 +3,7 @@ # Copyright (c) 1999-2001 Jason Gunthorpe # Copyright (c) 2002-2003,2006 Ryan Murray # Copyright (c) 2004-2005 Joey Schulze -# Copyright (c) 2008 Peter Palfrader +# Copyright (c) 2008,2011 Peter Palfrader # Copyright (c) 2008 Stephen Gran # # This program is free software; you can redistribute it and/or modify @@ -37,21 +37,24 @@ tempfile2='' cleanup () { - rm -f lock rm -rf $tempdir rm -f $tempfile rm -f $tempfile2 } -PATH=/sbin:/usr/sbin:/bin:/usr/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin export PATH 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 /var/lib/misc +exec 200< "." +if ! flock -w 60 -e 200; then + log "Cannot acquire lock on `pwd`" + exit 1 +fi + trap cleanup exit case $HOST in @@ -74,7 +77,7 @@ if [ -e /var/lib/misc/thishost/dns-zone ]; then cp /var/lib/misc/thishost/dns-zone $tempfile2 fi -rsync ${verbose} --delete-after -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" . +rsync ${verbose} --delete-after --times -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o ControlPath=/var/run/.ud-replicate.ssh.socket -o ControlMaster=auto -o ControlPersist=2h -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" . makedb "$HOST/passwd.tdb" -o passwd.db.t if [ -s "$HOST/shadow.tdb" ] @@ -105,51 +108,9 @@ if [ -e ${HOST}/ssh-keys.tar.gz ]; then rsync -a --delete-after $tempdir/ userkeys/ fi -CHROOTS="" -if [ -x /usr/bin/dchroot ]; then - CHROOTS=`dchroot --listpaths` -elif [ -x /usr/bin/dchroot-dsa ]; then - CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}') -fi -if [ -n "$CHROOTS" ]; then - for c in $CHROOTS; do - if [ "$c" = "/" ] || [ "$c" = "" ]; then - echo "$0 WTF: \$c is '' or '/' here." 2>&1 - exit 1 - fi - if [ -x "$c/usr/bin/makedb" ] - then - mkdir -p "$c/var/lib/misc/$HOST" - - # remove extra stuff from earlier times and so - find "$c/var/lib/misc/$HOST" -mindepth 1 \ - ! -name group.tdb -a \ - ! -name passwd.tdb -a \ - ! -name ssh_known_hosts \ - -print0 | xargs --no-run-if-empty -0 rm -f - rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh_known_hosts "$c/var/lib/misc/$HOST" - - # clean up from the times we supposedly did shadow stuff in chroots - rm -f "$c/var/lib/misc/shadow.db" - - # from failed makedb runs earlier. - rm -f "$c/var/lib/misc/passwd.db.t" \ - "$c/var/lib/misc/group.db.t" - # build passwd information - chroot "$c" makedb "/var/lib/misc/$HOST/passwd.tdb" -o /var/lib/misc/passwd.db.t - chroot "$c" makedb "/var/lib/misc/$HOST/group.tdb" -o /var/lib/misc/group.db.t - mv -f "$c/var/lib/misc/passwd.db.t" "$c/var/lib/misc/passwd.db" - mv -f "$c/var/lib/misc/group.db.t" "$c/var/lib/misc/group.db" - - ln -sf "$HOST/ssh_known_hosts" "$c/var/lib/misc/" - if [ -d "$c/etc/ssh" ]; then - ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh" - elif [ -L "$c/etc/ssh" ] && [ "`readlink \"$c/etc/ssh\"`" = "../../var/lib/misc/ssh_known_hosts" ]; then - # clean up past mistakes - rm -f "$c/etc/ssh" - fi - fi - done +if [ -e ${HOST}/web-passwords ]; then + chown root:www-data ${HOST}/web-passwords + chmod 0640 ${HOST}/web-passwords fi if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then @@ -162,20 +123,38 @@ if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then /usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true fi -rndc_reload=0 +rebuild_zones=0 if [ -e /var/lib/misc/thishost/dns-sshfp ]; then - if cmp /var/lib/misc/thishost/dns-sshfp $tempfile; then - rndc_reload=1 + if ! cmp -s /var/lib/misc/thishost/dns-sshfp "$tempfile"; then + rebuild_zones=1 + fi +fi + +if [ -e /var/lib/misc/thishost/dns-zone ]; then + if ! cmp -s /var/lib/misc/thishost/dns-zone "$tempfile2"; then + rebuild_zones=1 fi fi -#if [ -e /var/lib/misc/thishost/dns-zone ]; then -# if cmp /var/lib/misc/thishost/dns-zone $tempfile2; then -# rndc_reload=1 -# fi -#fi +if [ "${rebuild_zones}" -gt 0 ]; then + sudo -u dnsadm /srv/dns.debian.org/bin/update +fi -if [ "${rndc_reload}" -gt 0 ]; then - /git/HOOKS/write_zonefile debian.org - rndc reload +if [ -d "/etc/freeradius" -a -e "$HOST/rtc-passwords" ]; then + if ! cmp -s "$HOST/rtc-passwords" /var/local/rtc-passwords.freerad; then + install -o freerad -g freerad -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.freerad + service freeradius reload + fi +fi +if [ -d "/etc/reTurn" -a -e "$HOST/rtc-passwords" ]; then + if ! cmp -s "$HOST/rtc-passwords" /var/local/rtc-passwords.return; then + install -o return -g return -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.return + service resiprocate-turn-server reload + fi +fi +if [ -d "/etc/prosody" -a -e "$HOST/rtc-passwords" ]; then + if ! cmp -s "$HOST/rtc-passwords" /var/local/rtc-passwords.prosody; then + install -o prosody -g prosody -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.prosody + service prosody reload + fi fi