Merge branch 'main' into feature/custom-basic-auth

This commit is contained in:
Pierre Delpy
2023-08-15 14:24:19 +02:00
committed by GitHub
21 changed files with 219 additions and 89 deletions

View File

@ -113,22 +113,7 @@ case "$ACTION" in
enroll)
loadVars
MANUAL_PROXY_ID="${3:-$PROXY_ID}"
if [ -z "$MANUAL_PROXY_ID" ]; then
log ERROR "No Proxy ID set"
exit 1
else
log INFO "Enrolling Beam Proxy Id $MANUAL_PROXY_ID"
fi
if [ -z "$SUPPORT_EMAIL" ]; then
EMAIL_PARAM=""
else
EMAIL_PARAM="--admin-email $SUPPORT_EMAIL"
fi
docker run --rm -ti -v /etc/bridgehead/pki:/etc/bridgehead/pki samply/beam-enroll:latest --output-file $PRIVATEKEYFILENAME --proxy-id $MANUAL_PROXY_ID $EMAIL_PARAM
chmod 600 $PRIVATEKEYFILENAME
do_enroll $PROXY_ID
;;
preRun | preUpdate)
fixPermissions