X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fget-dm-txt;h=0b9ab100fca3d66dfc9d699da799784ed34f8d99;hp=7902c1c559d023f0ee800bed11f83546188e025a;hb=b769d51ab9e8b6102ec82197c6cd4005b87a9ada;hpb=6818e4c5450f8373142af7b739739c85ad63dc21 diff --git a/infra/get-dm-txt b/infra/get-dm-txt index 7902c1c5..0b9ab100 100755 --- a/infra/get-dm-txt +++ b/infra/get-dm-txt @@ -1,16 +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=$(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 --ca-certificate=$cert --ca-directory=/dev/enoent \ - -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