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=3c3a62c24847d3d2d5bd634b5d407720b4a6fdb0;hb=c315665ee5ff99ad78b4621abfd6be0d73b4e0c9;hpb=6342c9fba5962066bb4606c6d930fe5bc3441851 diff --git a/infra/get-dm-txt b/infra/get-dm-txt index 3c3a62c2..0b9ab100 100755 --- a/infra/get-dm-txt +++ b/infra/get-dm-txt @@ -2,17 +2,18 @@ set -e 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