safebox/framework-scheduler
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

Enhance task execution logic to handle new certificate requests and improve debug output formatting
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
gyurix
2025-05-06 15:55:08 +02:00
parent ee0b103593
commit f9d43d43f9
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/scheduler/entrypoint.sh
View File

@@ -570,7 +570,7 @@ execute_task() {
# Executing task # Executing task
TASK_NAME=$(echo $TASK | cut -d ':' -f1) TASK_NAME=$(echo $TASK | cut -d ':' -f1)
if [ "$TASK_NAME" != "check_vpn" ]; then if [ "$TASK_NAME" != "check_vpn" ]; then
debug "TASK: $(echo $TASK_NAME | cut -d ':' -f1)" debug "TASK: $(echo $TASK_NAME | cut -d ':' -f1)"
fi fi
# checking sytem status # checking sytem status
@@ -803,6 +803,18 @@ execute_task() {
TEMPLATE=$(echo "$TEMPLATE" | base64 -w0) TEMPLATE=$(echo "$TEMPLATE" | base64 -w0)
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "TEMPLATE": "'$TEMPLATE'" }' | jq -r . | base64 -w0) JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "TEMPLATE": "'$TEMPLATE'" }' | jq -r . | base64 -w0)
elif [ "$TASK_NAME" == "letsencrypt" ]; then
DOMAINS=$(echo $B64_JSON | base64 -d | jq -r 'keys[]')
for DOMAIN in $(echo $DOMAINS); do
REQUEST=$(echo $B64_JSON | base64 -d | jq -r ".[\"$DOMAIN\"].status")
if [ "$REQUEST" == "requested" ]; then
echo "New certificate for $DOMAIN is requested."
touch /etc/system/data/ssl/keys/$DOMAIN/new_certificate
fi
done
elif [ "$DEPLOY_ACTION" == "deploy" ]; then elif [ "$DEPLOY_ACTION" == "deploy" ]; then
JSON_TARGET="" JSON_TARGET=""
#JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1" }' | jq -r . | base64 -w0) # deployment has started #JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1" }' | jq -r . | base64 -w0) # deployment has started
@@ -903,7 +915,7 @@ execute_task() {
fi fi
if [ "$TASK_NAME" != "check_vpn" ]; then if [ "$TASK_NAME" != "check_vpn" ]; then
debug "JSON_TARGET: $JSON_TARGET" debug "JSON_TARGET: $JSON_TARGET"
fi fi
if [ "$JSON_TARGET" != "" ]; then if [ "$JSON_TARGET" != "" ]; then
@@ -1066,9 +1078,9 @@ unset IFS
inotifywait --exclude "\.(swp|tmp)" -m -e CREATE,CLOSE_WRITE,DELETE,MOVED_TO -r $DIR | inotifywait --exclude "\.(swp|tmp)" -m -e CREATE,CLOSE_WRITE,DELETE,MOVED_TO -r $DIR |
while read dir op file; do while read dir op file; do
if [ "${op}" == "CLOSE_WRITE,CLOSE" ]; then if [ "${op}" == "CLOSE_WRITE,CLOSE" ]; then
if [ "$file" != "check_vpn.json" ]; then if [ "$file" != "check_vpn.json" ]; then
echo "new file created: $file" echo "new file created: $file"
fi; fi
B64_JSON=$(cat $DIR/$file | base64 -w0) B64_JSON=$(cat $DIR/$file | base64 -w0)
TASK=$(echo $file | cut -d '.' -f1) TASK=$(echo $file | cut -d '.' -f1)
execute_task "$TASK" "$B64_JSON" execute_task "$TASK" "$B64_JSON"