Test suite: mirror: Synchronise properly with drs background mirror

[dgit.git] / infra / get-dm-txt

diff --git a/infra/get-dm-txt b/infra/get-dm-txt
index df715d069b8de1aa9ee3f1d08e89d31ff6804a8f..0b9ab100fca3d66dfc9d699da799784ed34f8d99 100755 (executable)
--- a/infra/get-dm-txt
+++ b/infra/get-dm-txt
@@ -1,18 +1,19 @@
 #!/bin/sh
 set -e
 
-cd /srv/dgit.debian.org/data
+cd ${DGIT_INFRA_GETDMTXT_DATADIR-/srv/dgit.debian.org/data}
+${DGIT_INFRA_GETDMTXT_UMASK-umask 002}
 
 file=dm.txt
 server=ftp-master.debian.org
 path=$file
-cert=/etc/ssl/certs/$server.pem
 
-certargs="--ca-certificate=$cert --ca-directory=/dev/enoent"
+certargs=$(git config dgit-distro.debian.archive-query-tls-curl-ca-args \
+       || (echo >&2 "git config failed"; exit 1))
 
 with-lock-ex -f $file.lock sh -c "
-       if ! wget $certargs \
-               -O $file.new https://$server/$path >$file.stderr 2>&1; then
+       if ! curl $certargs \
+               >$file.new https://$server/$path 2>$file.stderr; then
                cat $file.stderr >&2
                exit 127
        fi