Tabs to spaces
This commit is contained in:
parent
c836c7ab40
commit
640bd0b7c7
1 changed files with 15 additions and 15 deletions
|
@ -19,7 +19,7 @@ function init_if_possible () {
|
|||
fi
|
||||
done
|
||||
if [ ${missing_vars} = 1 ]; then
|
||||
>&2 echo "there is no ca.json config file; please run step ca init, or provide config parameters via DOCKER_STEPCA_INIT_ vars"
|
||||
>&2 echo "there is no ca.json config file; please run step ca init, or provide config parameters via DOCKER_STEPCA_INIT_ vars"
|
||||
else
|
||||
step_ca_init "${@}"
|
||||
fi
|
||||
|
@ -36,18 +36,18 @@ function generate_password () {
|
|||
function step_ca_init () {
|
||||
local -a setup_args=(
|
||||
--name "${DOCKER_STEPCA_INIT_NAME}"
|
||||
--dns "${DOCKER_STEPCA_INIT_DNS_NAMES}"
|
||||
--provisioner "${DOCKER_STEPCA_INIT_PROVISIONER_NAME:-admin}"
|
||||
--password-file "${STEPPATH}/password"
|
||||
--provisioner-password-file "${STEPPATH}/provisioner_password"
|
||||
--dns "${DOCKER_STEPCA_INIT_DNS_NAMES}"
|
||||
--provisioner "${DOCKER_STEPCA_INIT_PROVISIONER_NAME:-admin}"
|
||||
--password-file "${STEPPATH}/password"
|
||||
--provisioner-password-file "${STEPPATH}/provisioner_password"
|
||||
--address ":9000"
|
||||
)
|
||||
if [ -n "${DOCKER_STEPCA_INIT_PASSWORD}" ]; then
|
||||
echo "${DOCKER_STEPCA_INIT_PASSWORD}" > "${STEPPATH}/password"
|
||||
echo "${DOCKER_STEPCA_INIT_PASSWORD}" > "${STEPPATH}/provisioner_password"
|
||||
else
|
||||
generate_password > "${STEPPATH}/password"
|
||||
generate_password > "${STEPPATH}/provisioner_password"
|
||||
else
|
||||
generate_password > "${STEPPATH}/password"
|
||||
generate_password > "${STEPPATH}/provisioner_password"
|
||||
fi
|
||||
if [ -n "${DOCKER_STEPCA_INIT_SSH}" ]; then
|
||||
setup_args=("${setup_args[@]}" --ssh)
|
||||
|
@ -60,22 +60,22 @@ function step_ca_init () {
|
|||
fi
|
||||
step ca init "${setup_args[@]}"
|
||||
mv $STEPPATH/password $PWDPATH
|
||||
mv $STEPPATH/provisioner_password $PROVISIONER_PWDPATH
|
||||
mv $STEPPATH/provisioner_password $PROVISIONER_PWDPATH
|
||||
}
|
||||
|
||||
if [ -f /usr/sbin/pcscd ]; then
|
||||
/usr/sbin/pcscd
|
||||
/usr/sbin/pcscd
|
||||
fi
|
||||
|
||||
if [ ! -f "${STEPPATH}/config/ca.json" ]; then
|
||||
init_if_possible
|
||||
init_if_possible
|
||||
fi
|
||||
|
||||
if [ ! -f "${PROVISIONER_PWDPATH}" ]; then
|
||||
# For backward compatibility,
|
||||
# if the --provisioner-password-file doesn't exist,
|
||||
# use the same password as the CA.
|
||||
cp ${PWDPATH} ${PROVISIONER_PWDPATH}
|
||||
# For backward compatibility,
|
||||
# if the --provisioner-password-file doesn't exist,
|
||||
# use the same password as the CA.
|
||||
cp ${PWDPATH} ${PROVISIONER_PWDPATH}
|
||||
fi
|
||||
|
||||
exec "${@}"
|
||||
|
|
Loading…
Add table
Reference in a new issue