# Now check if we still know about the packages for which they created the files
# is the timestamp signed by us?
- if $(gpgv --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.gpg timestamp); then
+ if gpgv --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.gpg timestamp; then
# now read it. As its signed by us we are sure the content is what we expect, no need
# to do more here. And we only test -d a directory on it anyway.
TSTAMP=$(cat timestamp)
for comp in main contrib non-free; do
mkdir -p ${ftpdir}/dists/${dir}/${comp}/dep11
cd ${dir}/${comp}
- rsync -aq --delete --delete-after --exclude *.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
+ rsync -aq --delete --delete-after --exclude ./*.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
cd ${dep11dir}
done
fi
else
SERIAL="${FILESOAPLUS1}"
fi
+ RFC822DATE=$(LC_ALL=POSIX LANG=POSIX date -u -R)
date -u > ${TRACEFILE}
- echo "Using dak v1" >> ${TRACEFILE}
- echo "Running on host: $(hostname -f)" >> ${TRACEFILE}
- echo "Archive serial: ${SERIAL}" >> ${TRACEFILE}
+ {
+ echo "Using dak v1"
+ echo "Running on host: $(hostname -f)"
+ echo "Archive serial: ${SERIAL}"
+ echo "Date: ${RFC822DATE}"
+ } >> ${TRACEFILE}
+ # Now make it accessible via one name, no matter on which host we run
+ cd ${archiveroot}/project/trace/
+ ln -sf ftp-master.debian.org master
mkdir -p ${targetpath}
cd ${targetpath}
while read SHASUM SIZE NAME; do
if ! [[ -f ${subdir}/${NAME} ]]; then
bname=$(basename ${NAME})
- if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+|Components-(amd64|i386)\.yml|icons-(128x128|64x64)\.tar)$ ]]; then
+ if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+|Components-[a-zA-Z0-9-]+\.yml|icons-(128x128|64x64)\.tar)$ ]]; then
# We don't keep unpacked files, don't check for their existance.
# We might want to go and check their unpacked shasum, but right now
ftp-master)
fname="mirrorstart"
pusharg=""
+ pname="debian"
;;
debian-debug)
pusharg="-a debug"
;;&
*)
fname="mirrorstart.${archive}"
+ pname=${archive}
;;
esac
- date -u > /srv/ftp.debian.org/web/${fname}
- echo "Using dak v1" >> /srv/ftp.debian.org/web/${fname}
- echo "Running on host $(hostname -f)" >> /srv/ftp.debian.org/web/${fname}
+ mkdir -p ${webdir}/${pname}/project/trace/
+ ln -sf ${mirrordir}/${archive}/project/trace/master ${webdir}/${pname}/project/trace/master
+
+ date -u > ${webdir}/${fname}
+ echo "Using dak v1" >> ${webdir}/${fname}
+ echo "Running on host $(hostname -f)" >> ${webdir}/${fname}
sudo -H -u archvsync /home/archvsync/runmirrors ${pusharg} > ~dak/runmirrors-${archive}.log 2>&1 &
fi
done
}
function maillogfile() {
- cat "$LOGFILE" | mail -a "X-Debian: DAK" -s "Log for dinstall run of ${NOW}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" cron@ftp-master.debian.org
+ mail -a "X-Debian: DAK" -s "Log for dinstall run of ${NOW}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" cron@ftp-master.debian.org < "${LOGFILE}"
}
function testingsourcelist() {