Skip to content

Commit

Permalink
Add environment variable for cron job user
Browse files Browse the repository at this point in the history
Add the environment variable COMANAGE_REGISTRY_CRON_USER
to allow the user for which the cron job should run to be
injected. The default is still www-data.
  • Loading branch information
skoranda committed May 6, 2022
1 parent 3959fb5 commit fc466ef
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions comanage-registry-base/comanage_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ function comanage_utils::consume_injected_environment() {
COMANAGE_REGISTRY_ADMIN_GIVEN_NAME
COMANAGE_REGISTRY_ADMIN_FAMILY_NAME
COMANAGE_REGISTRY_ADMIN_USERNAME
COMANAGE_REGISTRY_CRON_USER
COMANAGE_REGISTRY_CRONTAB
COMANAGE_REGISTRY_DATASOURCE
COMANAGE_REGISTRY_DATABASE
Expand Down Expand Up @@ -177,6 +178,7 @@ function comanage_utils::consume_injected_environment() {
# Deploy crontab file
# Globals:
# COMANAGE_REGISTRY_DIR
# COMANAGE_REGISTRY_CRON_USER
# COMANAGE_REGISTRY_CRONTAB
# OUTPUT
# Arguments:
Expand All @@ -187,16 +189,23 @@ function comanage_utils::consume_injected_environment() {
function comanage_utils::deploy_crontab() {

local crontab
local cronuser

if [[ -n "$COMANAGE_REGISTRY_CRONTAB" ]]; then
crontab="$COMANAGE_REGISTRY_CRONTAB"
if [[ -n "${COMANAGE_REGISTRY_CRONTAB}" ]]; then
crontab="${COMANAGE_REGISTRY_CRONTAB}"
else
crontab="$COMANAGE_REGISTRY_DIR/local/crontab"
crontab="${COMANAGE_REGISTRY_DIR}/local/crontab"
fi

if [[ -f "$crontab" ]]; then
echo "Deploying crontab $crontab..." > "$OUTPUT" 2>&1
/usr/bin/crontab -u www-data $crontab > "$OUTPUT" 2>&1
if [[ -n "${COMANAGE_REGISTRY_CRON_USER}" ]]; then
cronuser="${COMANAGE_REGISTRY_CRON_USER}"
else
cronuser="www-data"
fi

if [[ -f "${crontab}" ]]; then
echo "Deploying crontab ${crontab} for user ${cronuser} ..." > "${OUTPUT}" 2>&1
/usr/bin/crontab -u "${cronuser}" "${crontab}" > "${OUTPUT}" 2>&1
fi
}

Expand Down

0 comments on commit fc466ef

Please sign in to comment.