From 485ef8a3b012c7519d42e125ecdb4348ad50a6cb Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 23 May 2014 22:37:13 +0530 Subject: [PATCH] update ca-certificates only if additional certificates exist --- assets/init | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/init b/assets/init index 5704c8e1..939f21c4 100755 --- a/assets/init +++ b/assets/init @@ -201,10 +201,14 @@ sed 's,{{GITLAB_RELATIVE_URL_ROOT}},'${GITLAB_RELATIVE_URL_ROOT}',g' -i /etc/ngi echo "Starting nginx..." supervisorctl start nginx >/dev/null -echo "Updating CA certificates..." -[ -f "${SSL_CERTIFICATE_PATH}" ] && cp "${SSL_CERTIFICATE_PATH}" /usr/local/share/ca-certificates/gitlab.crt -[ -f "${CA_CERTIFICATES_PATH}" ] && cp "${CA_CERTIFICATES_PATH}" /usr/local/share/ca-certificates/ca.crt -update-ca-certificates --fresh >/dev/null 2>&1 +if [ -f "${SSL_CERTIFICATE_PATH}" -o -f "${CA_CERTIFICATES_PATH}" ]; then + echo "Updating CA certificates..." + [ -f "${SSL_CERTIFICATE_PATH}" ] && \ + cp "${SSL_CERTIFICATE_PATH}" /usr/local/share/ca-certificates/gitlab.crt + [ -f "${CA_CERTIFICATES_PATH}" ] && \ + cp "${CA_CERTIFICATES_PATH}" /usr/local/share/ca-certificates/ca.crt + update-ca-certificates --fresh >/dev/null 2>&1 +fi # start mysql server if ${DB_HOST} is localhost if [ "${DB_HOST}" == "localhost" ]; then