vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3220 from quay/certs-fix

Browse source 
Fix certs install script (again)
This commit is contained in:
Sam Chow 2018-08-23 14:05:21 -04:00 committed by GitHub
commit 0681784012
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/init/certs_install.sh
View file

@ -1,9 +1,9 @@
#! /bin/bash #! /bin/bash
set -e set -e
QUAYPATH=${QUAYPATH:-"."} QUAYPATH=${QUAYPATH:-"."}
QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf/stack"} QUAYCONF=${QUAYCONF:-"$QUAYPATH/conf"}
QUAYCONFIG=${QUAYCONFIG:-"$QUAYCONF/stack"} 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 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 if [[ "$KUBERNETES_SERVICE_HOST" != "" ]];then
@ -37,7 +37,7 @@ if [ -f $CERTDIR ]; then
fi fi
# Add extra trusted certificates (prefixed) # 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 do
echo "Installing extra cert $f" echo "Installing extra cert $f"
cp "$f" /usr/local/share/ca-certificates/ cp "$f" /usr/local/share/ca-certificates/