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

bash->sh fix

Browse Source
This commit is contained in:
Gyorgy Berenyi
2024-08-22 17:49:25 +02:00
parent f60539f0b5
commit a6aed08961
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/scheduler/entrypoint.sh
View File

@@ -75,7 +75,7 @@ $VOLUME_MOUNTS \
$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
# TEMP template JSON test nextcloud.json
NEXTCLOUD_TEMPLATE="
NEXTCLOUD_TEMPLATE='
{
"name": "nextcloud",
"fields": [
@@ -97,7 +97,7 @@ NEXTCLOUD_TEMPLATE="
}
]
}
";
';
if [ "$SERVICE_DIR" == "" ]; then
SERVICE_DIR="/etc/user/config/services";
@@ -354,12 +354,12 @@ execute_task() {
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "INSTALL_STATUS": "'$INSTALL_STATUS'" }' | jq -r . | base64 -w0);
elif [ "$TASK_NAME" == "system" ]; then
#SYSTEM_LIST=("core-dns.json" "cron.json" "domain-local-backend.json" "firewall-letsencrypt.json" "firewall-local-backend.json" "firewall-localloadbalancer-dns.json" "firewall-localloadbalancer-to-smarthostbackend.json" "firewall-smarthost-backend-dns.json" "firewall-smarthost-loadbalancer-dns.json" "firewall-smarthost-to-backend.json" "firewall-smarthostloadbalancer-from-publicbackend.json" "letsencrypt.json" "local-backend.json" "local-proxy.json" "service-framework.json" "smarthost-proxy-scheduler.json" "smarthost-proxy.json")
SYSTEM_LIST=("core-dns.json" "cron.json" "letsencrypt.json" "local-proxy.json" "service-framework.json" "smarthost-proxy-scheduler.json" "smarthost-proxy.json")
#SYSTEM_LIST="core-dns.json cron.json domain-local-backend.json firewall-letsencrypt.json firewall-local-backend.json firewall-localloadbalancer-dns.json firewall-localloadbalancer-to-smarthostbackend.json firewall-smarthost-backend-dns.json firewall-smarthost-loadbalancer-dns.json firewall-smarthost-to-backend.json firewall-smarthostloadbalancer-from-publicbackend.json letsencrypt.json local-backend.json local-proxy.json service-framework.json smarthost-proxy-scheduler.json smarthost-proxy.json"
SYSTEM_LIST="core-dns.json cron.json letsencrypt.json local-proxy.json service-framework.json smarthost-proxy-scheduler.json smarthost-proxy.json";
INSTALLED_SERVICES=$(ls /etc/user/config/services/*.json );
SERVICES="";
for SERVICE in $(echo $INSTALLED_SERVICES); do
for ITEM in "${SYSTEM_LIST[@]}"; do
for ITEM in $SYSTEM_LIST; do
if [ "$(basename $SERVICE)" == "$ITEM" ]; then # system file
CONTENT=$(cat $SERVICE | base64 -w0);
if [ "$SERVICES" != "" ]; then