Merge branch 'main' of https://git.format.hu/safebox/framework-scheduler

scripts/scheduler/entrypoint.sh

@@ -4,10 +4,6 @@ cd /scripts
 DEBUG_MODE=${DEBUG_MODE:-false}
 VERSION=1.1.0
 
-# Set installed version number
-echo '{}' | jq --arg VERSION "$VERSION" '.VERSION = $VERSION' > /var/tmp/shared/output/version.json
-############################
-
 #DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
 DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-safebox}
 USER_INIT_PATH=$USER_INIT_PATH
@@ -120,7 +116,7 @@ generate_backup_server_secrets () {
             "backupserver":{
                 "SSH_USER":"'$SSH_USER'",
                 "SSH_PORT":"'$SSH_PORT'",
-                "SSH_PASSWORD":"'$SSH_PASSWORD'"
+                "SSH_PASSWORD":"'$SSH_PASSWORD'",
                 "PASSWORD":"'$PASSWORD'",
                 "PERIOD":"'$PERIOD'",
                 "COMPRESSION":"'$COMPRESSION'",
@@ -157,7 +153,7 @@ create_backup_service () {
         }
             ],
     "ENTRYPOINT": "sh -c",
-    "CMD": "mkdir -p /etc/user/data/backup/server/",
+    "CMD": "mkdir -p /etc/user/data/backup/server/ssh",
     "POST_START": []
     },
     {
@@ -182,15 +178,16 @@ create_backup_service () {
         "DEST": "/etc/user/secret/",
         "TYPE": "ro"
         },
+        {
         "SOURCE": "/etc/user/data/backup/server/ssh",
         "DEST": "/home/'$SSH_USER'/",
         "TYPE": "rw"
         }
             ],
     "ENV_FILES":["/etc/user/secret/backup/server/backup.json"],
-    '$ADDITIONAL'
+    '$ADDITIONAL',
     "POST_START": []
-        },
+        }
     ]
  }' 
     # create backup server secrets from variables
@@ -211,9 +208,9 @@ backup_set_service() {
     local BACKUP_VPN_CLIENTS="$8"
 
     local VPN="$9"
-    local SSH_PORT="${10}"
+    local SSH_PORT="${10:-20022}"
-    local SSH_USER="${11}"
+    local SSH_USER="${11:-"backup"}"
-    local SSH_PASSWORD="${12}"
+    local SSH_PASSWORD="${12:-"backup"}"
     local OPERATION="${13}"
 
     if [ "$OPERATION" == "DELETE" ]; then
@@ -268,9 +265,9 @@ backup_set_client() {
     local NAME="$1"
     local SIZE="$2"
     local VPN="$3"
-    local SSH_PORT="$4"
+    local SSH_PORT="${4:-20022}"
-    local SSH_USER="$5"
+    local SSH_USER="${5:-"backup"}"
-    local SSH_PASSWORD="$6"
+    local SSH_PASSWORD="${6:-"backup"}"
     local OPERATION="$7"
     local VPN_KEY="$8"
 
@@ -323,7 +320,7 @@ backup_set_client() {
         }
             ],
     "ENTRYPOINT": "sh -c",
-    "CMD": "mkdir -p /etc/user/data/backup/clients/'$NAME'/backup && mkdir -p /etc/user/data/backup/clients/'$NAME'/ssh",
+    "CMD": "mkdir -p /etc/user/data/backup/clients/'$NAME'/backup && mkdir -p /etc/user/data/backup/clients/'$NAME'/ssh" && chmod -R '$SSH_USER':'$SSH_USER' /etc/user/data/backup/clients/'$NAME'",
     "POST_START": []
     },
     {
@@ -1242,15 +1239,17 @@ execute_task() {
 
         VPN_STATUS="0"
         VPN_RESULT=""
-        CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -w wireguardproxy)
+        if [ -f $SECRET_DIR/vpn-proxy/wg0.conf ]; then
-        if [ "$CONTAINERS" != "" ]; then
+            CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -w wireguardproxy)
-            UP=$(echo $CONTAINERS | grep -w 'Up')
+            if [ "$CONTAINERS" != "" ]; then
-            if [ "$UP" != "" ]; then
+                UP=$(echo $CONTAINERS | grep -w 'Up')
-                VPN_STATUS="2"
+                if [ "$UP" != "" ]; then
-            else
+                    VPN_STATUS="1"
-                VPN_STATUS="1"
+                else
+                    VPN_STATUS="2"
+                fi
+                VPN_RESULT=$(echo "$CONTAINERS" | base64 -w0)
             fi
-            VPN_RESULT=$(echo "$CONTAINERS" | base64 -w0)
         fi
         JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "'$VPN_STATUS'", "RESULT": "'$VPN_RESULT'" }' | jq -r . | base64 -w0)
 
@@ -1496,7 +1495,13 @@ DATE=$(date +%F-%H-%M-%S)
 DIR=$SHARED/input
 
 # Triggers by certificate or domain config changes
+# Set installed version number
+echo '{}' | jq --arg VERSION "$VERSION" '.VERSION = $VERSION' > $SHARED/output/version.json
+############################
 
+if [ "$DEBUG_MODE" == "true" ]; then
+    rm $DIR/*
+fi
 unset IFS
 
 inotifywait --exclude "\.(swp|tmp)" -m -e CREATE,CLOSE_WRITE,DELETE,MOVED_TO -r $DIR |