# Copyright (c) 1999-2001 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2002-2003,2006 Ryan Murray <rmurray@debian.org>
# Copyright (c) 2004-2005 Joey Schulze <joey@infodrom.org>
-# Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2008,2011 Peter Palfrader <peter@palfrader.org>
# Copyright (c) 2008 Stephen Gran <sgran@debian.org>
#
# This program is free software; you can redistribute it and/or modify
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`;
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 PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
makedb "$HOST/passwd.tdb" -o passwd.db.t
if [ -s "$HOST/shadow.tdb" ]
rsync -a --delete-after $tempdir/ userkeys/
fi
+if [ -e ${HOST}/web-passwords ]; then
+ chown root:www-data ${HOST}/web-passwords
+ chmod 0640 ${HOST}/web-passwords
+fi
+
CHROOTS=""
if [ -x /usr/bin/dchroot ]; then
CHROOTS=`dchroot --listpaths`
rndc_reload=0
if [ -e /var/lib/misc/thishost/dns-sshfp ]; then
- if cmp /var/lib/misc/thishost/dns-sshfp $tempfile; then
+ if ! cmp -s /var/lib/misc/thishost/dns-sshfp $tempfile; then
+ /git/HOOKS/write_zonefile "$EMAILAPPEND"
rndc_reload=1
fi
fi
if [ -e /var/lib/misc/thishost/dns-zone ]; then
- if cmp /var/lib/misc/thishost/dns-zone $tempfile2; then
+ if ! cmp -s /var/lib/misc/thishost/dns-zone $tempfile2; then
+ /git/HOOKS/write_zonefile debian.net
rndc_reload=1
fi
fi
-# FIXME:
-# this needs to rebuild the zone file with a new serial so it can replicate.
-# this means splitting the functionality in the current git hook into two scripts,
-# one of which takes a file and maybe some other arguments and rebuilds the zone
-# file, the other doing the git pull and determining which files to rebuild.
-# this is just a temporary hack to have some logical flow in place.
-
if [ "${rndc_reload}" -gt 0 ]; then
rndc reload
fi