From d58930095f941e5e29c31820ee9e1d6a9513fe0e Mon Sep 17 00:00:00 2001 From: Sam Chow Date: Thu, 23 Aug 2018 13:33:57 -0400 Subject: [PATCH] Fix certs install script (again) --- conf/init/certs_install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init/certs_install.sh b/conf/init/certs_install.sh index e58d282bb..8643faa8c 100755 --- a/conf/init/certs_install.sh +++ b/conf/init/certs_install.sh @@ -1,9 +1,9 @@ #! /bin/bash set -e QUAYPATH=${QUAYPATH:-"."} -QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf/stack"} +QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf"} QUAYCONFIG=${QUAYCONFIG:-"$QUAYCONF/stack"} -CERTDIR=${QUAYCONFIG/extra_ca_certs} +CERTDIR=${CERTDIR:-"$QUAYCONFIG/extra_ca_certs"} # If we're running under kube, the previous script (02_get_kube_certs.sh) will put the certs in a different location if [[ "$KUBERNETES_SERVICE_HOST" != "" ]];then @@ -37,7 +37,7 @@ if [ -f $CERTDIR ]; then fi # Add extra trusted certificates (prefixed) -for f in $(find $CERTDIR/ -maxdepth 1 -type f -name "extra_ca*") +for f in $(find $QUAYCONFIG/ -maxdepth 1 -type f -name "extra_ca*") do echo "Installing extra cert $f" cp "$f" /usr/local/share/ca-certificates/