summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-06-28 16:03:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-06-28 16:03:47 +0100
commit380552def4af93d4f299a706a9c01e8db2f725d0 (patch)
treebe7456cb1853af1ad775999afbdac0e128654712 /dgit
parent3c23e61220277be62495b903ee29373a53a6d711 (diff)
Infra: Honour archive-query-tls-curl-ca-args
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit8
1 files changed, 8 insertions, 0 deletions
diff --git a/dgit b/dgit
index 4986dd0..eea4dbc 100755
--- a/dgit
+++ b/dgit
@@ -452,6 +452,10 @@ our %defcfg = ('dgit.default.distro' => 'debian',
'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
'dgit-distro.debian.archive-query-tls-key',
'/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
+#
+# 'dgit-distro.debian.archive-query-tls-curl-args',
+# '--ca-path=/etc/ssl/ca-debian',
+# ^ this is a workaround but works (only) on DSA-administered machines
'dgit-distro.debian.diverts.alioth' => '/alioth',
'dgit-distro.debian/alioth.git-host' => 'git.debian.org',
'dgit-distro.debian/alioth.git-user-force' => '',
@@ -716,6 +720,10 @@ sub archive_api_query_cmd ($) {
push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
last;
}
+ # Fixing #790093 properly will involve providing a value
+ # for this on clients.
+ my $keys = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
+ push @cmd, split / /, $keys if defined $keys;
}
push @cmd, $url.$subpath;
return @cmd;