feat(salt-api): Add SALT_API_CERT_CN env variable
Use this environment variable in order to set the salt-api certificatescommon name.
This commit is contained in:
@@ -208,10 +208,9 @@ function configure_salt_api()
|
||||
echo "Configuring salt-api service ..."
|
||||
|
||||
CERTS_PATH=/etc/pki
|
||||
SALT_API_KEY_FILE='docker-salt-master'
|
||||
rm -rf "${CERTS_PATH}/tls/certs/*"
|
||||
salt-call --local tls.create_self_signed_cert cacert_path="${CERTS_PATH}" CN="${SALT_API_KEY_FILE}"
|
||||
chown "${SALT_USER}": "${CERTS_PATH}/tls/certs/${SALT_API_KEY_FILE}".{crt,key}
|
||||
rm -rf "${CERTS_PATH}"/tls/certs/*
|
||||
salt-call --local tls.create_self_signed_cert cacert_path="${CERTS_PATH}" CN="${SALT_API_CERT_CN}"
|
||||
chown "${SALT_USER}": "${CERTS_PATH}/tls/certs/${SALT_API_CERT_CN}".{crt,key}
|
||||
|
||||
cat >> "${SALT_ROOT_DIR}/master" <<EOF
|
||||
|
||||
@@ -223,8 +222,8 @@ api_logfile: ${SALT_LOGS_DIR}/salt/api
|
||||
|
||||
rest_cherrypy:
|
||||
port: 8000
|
||||
ssl_crt: ${CERTS_PATH}/tls/certs/${SALT_API_KEY_FILE}.crt
|
||||
ssl_key: ${CERTS_PATH}/tls/certs/${SALT_API_KEY_FILE}.key
|
||||
ssl_crt: ${CERTS_PATH}/tls/certs/${SALT_API_CERT_CN}.crt
|
||||
ssl_key: ${CERTS_PATH}/tls/certs/${SALT_API_CERT_CN}.key
|
||||
EOF
|
||||
|
||||
# configure supervisord to start salt-api
|
||||
|
||||
Reference in New Issue
Block a user