Update scripts/scheduler/entrypoint.sh

scripts/scheduler/entrypoint.sh

@@ -2,7 +2,7 @@
 
 cd /scripts
 DEBUG_MODE=${DEBUG_MODE:-false}
-VERSION=1.1.0
+VERSION=1.1.1
 
 #DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
 DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-safebox}
@@ -112,6 +112,8 @@ backup_query_state() {
 
 generate_backup_server_secrets () {
 
+        mkdir -p $SECRET_DIR/backup/server
+
         echo '{ 
             "backupserver":{
                 "SSH_USER":"'$SSH_USER'",
@@ -125,7 +127,7 @@ generate_backup_server_secrets () {
                 "BACKUP_LOCAL_CLIENTS":"'$BACKUP_LOCAL_CLIENTS'",
                 "BACKUP_VPN_CLIENTS":"'$BACKUP_VPN_CLIENTS'"
             }
-        }' | jq -r . > /etc/user/secret/backup/server/backup.json
+        }' | jq -r . > $SECRET_DIR/backup/server/backup.json
 }
 
 create_backup_service () {
@@ -320,7 +322,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" && chmod -R '$SSH_USER':'$SSH_USER' /etc/user/data/backup/clients/'$NAME'",
+    "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": []
     },
     {
@@ -335,13 +337,12 @@ backup_set_client() {
     "VOLUMES":[
         { 
         "SOURCE": "/etc/user/data/backup/clients/'$NAME'/backup",
-        "DEST": "/backup",
+        "DEST": "/home/'$SSH_USER'/backup",
         "TYPE": "rw"                   
         },                       
         {
         "SOURCE": "/etc/user/data/backup/clients/'$NAME'/ssh",                   
-        "DEST": "/home/'$SSH_USER'/",
+        "DEST": "/home/'$SSH_USER'/.ssh",
-        "TYPE": "rw"
         }
             ],
     "POST_START": []
@@ -349,8 +350,8 @@ backup_set_client() {
     ]
  }' | jq -r . >/etc/user/config/services/service-backup-client-$NAME.json
 
-        debug "service-backup-client-$NAME.json stop force dns-remove"
+        debug "service-backup-client-$NAME.json start info"
-        $service_exec service-backup-client-$NAME.json start &
+        $service_exec service-backup-client-$NAME.json start info &
 
     fi
 
@@ -509,6 +510,10 @@ get_repositories() {
     local TREES=""
     local REPO
 
+    if [ ! -f "/etc/user/config/repositories.json" ]; then
+        create_repositories_json
+    fi
+
     REPOS=$(jq -r .repositories[] /etc/user/config/repositories.json) # list of repos, delimiter by space
     for REPO in $REPOS; do
 
@@ -1244,9 +1249,9 @@ execute_task() {
             if [ "$CONTAINERS" != "" ]; then
                 UP=$(echo $CONTAINERS | grep -w 'Up')
                 if [ "$UP" != "" ]; then
-                    VPN_STATUS="2"
-                else
                     VPN_STATUS="1"
+                else
+                    VPN_STATUS="2"
                 fi
                 VPN_RESULT=$(echo "$CONTAINERS" | base64 -w0)
             fi