X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b161916d6b97e8b7205670ecc972a590749dd93c..43c0c9be21e63ed268d199991a9ad29ec802dbed:/tools/salt-install/provision.sh diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 44f3d4dffc..080029876b 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -548,16 +548,15 @@ if [ -z "${ROLES}" ]; then grep -q "aws_credentials" ${S_DIR}/top.sls || echo " - extra.aws_credentials" >> ${S_DIR}/top.sls fi grep -q "letsencrypt" ${S_DIR}/top.sls || echo " - letsencrypt" >> ${S_DIR}/top.sls - else - # Use custom certs, as both bring-your-own and self-signed are copied using this state + elif [ "${SSL_MODE}" = "bring-your-own" ]; then # Copy certs to formula extra/files - # In dev mode, the files will be created and put in the destination directory by the - # snakeoil_certs.sls state file mkdir -p /srv/salt/certs cp -rv ${CUSTOM_CERTS_DIR}/* /srv/salt/certs/ # We add the custom_certs state grep -q "custom_certs" ${S_DIR}/top.sls || echo " - extra.custom_certs" >> ${S_DIR}/top.sls fi + # In self-signed mode, the certificate files will be created and put in the + # destination directory by the snakeoil_certs.sls state file echo " - postgres" >> ${S_DIR}/top.sls echo " - docker.software" >> ${S_DIR}/top.sls