From 005cb811d937fe52cee11d76484252ed7167f9a8 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 16 Dec 2016 13:38:02 -0500 Subject: [PATCH] 10684: Don't overwrite default certs search path unless -ca-certs provided. --- services/crunch-run/crunchrun.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go index 10b3a61c88..ebee1a8f1e 100644 --- a/services/crunch-run/crunchrun.go +++ b/services/crunch-run/crunchrun.go @@ -912,12 +912,14 @@ func main() { cgroupRoot := flag.String("cgroup-root", "/sys/fs/cgroup", "path to sysfs cgroup tree") cgroupParent := flag.String("cgroup-parent", "docker", "name of container's parent cgroup (ignored if -cgroup-parent-subsystem is used)") cgroupParentSubsystem := flag.String("cgroup-parent-subsystem", "", "use current cgroup for given subsystem as parent cgroup for container") - caCertsPath := flag.String("ca-certs", "/etc/arvados/ca-certificates.crt", "Path to TLS root certificates") + caCertsPath := flag.String("ca-certs", "", "Path to TLS root certificates") flag.Parse() containerId := flag.Arg(0) - arvadosclient.CertFiles = []string{*caCertsPath} + if *caCertsPath != "" { + arvadosclient.CertFiles = []string{*caCertsPath} + } api, err := arvadosclient.MakeArvadosClient() if err != nil { -- 2.30.2