Refactor backup service parameters and add default SSH host value

scripts/scheduler/entrypoint.sh

@@ -2,10 +2,24 @@
 
 cd /scripts
 DEBUG_MODE=${DEBUG_MODE:-false}
-VERSION=1.1.1
+
+VERSION="1.1.4"
 
 #DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
 DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-safebox}
+DOCKER_REGISTRY_USERNAME=$DOCKER_REGISTRY_USERNAME
+DOCKER_REGISTRY_PASSWORD=$DOCKER_REGISTRY_PASSWORD
+
+if [ -n "$DOCKER_REGISTRY_USERNAME" ] && [ -n "$DOCKER_REGISTRY_PASSWORD" ]; then
+    echo "Logging in to Docker registry $DOCKER_REGISTRY_URL"
+    echo "$DOCKER_REGISTRY_PASSWORD" | docker login $DOCKER_REGISTRY_URL --username $DOCKER_REGISTRY_USERNAME --password-stdin
+    DOCKER_REGISTRY_ENVS="--env DOCKER_REGISTRY_USERNAME=$DOCKER_REGISTRY_USERNAME --env DOCKER_REGISTRY_PASSWORD=$DOCKER_REGISTRY_PASSWORD"
+
+else
+    echo "No Docker registry credentials provided, skipping login."
+fi
+
+
 USER_INIT_PATH=$USER_INIT_PATH
 GLOBAL_VERSION=${GLOBAL_VERSION:-latest}
 SERVICE_DIR=${SERVICE_DIR:-/etc/user/config/services}
@@ -20,6 +34,14 @@ FRAMEWORK_SCHEDULER_NETWORK_SUBNET=${FRAMEWORK_SCHEDULER_NETWORK_SUBNET:-"172.19
 FRAMEWORK_SCHEDULER_VERSION=${FRAMEWORK_SCHEDULER_VERSION:-latest}
 RUN_FORCE=${RUN_FORCE:-false}
 
+if [ "$DEBUG_MODE" == "true" ]; then
+    DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'"
+    SET_DEBUG_MODE="--env DEBUG_MODE=true"
+else
+    DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
+    SET_DEBUG_MODE=""
+fi
+
 WEB_SERVER=${WEB_SERVER:-webserver}
 WEB_IMAGE=${WEB_IMAGE:-web-installer}
 WEBSERVER_PORT=${WEBSERVER_PORT:-8080}
@@ -81,6 +103,8 @@ $VOLUME_MOUNTS \
 --env SETUP_VERSION=$SETUP_VERSION \
 --env GLOBAL_VERSION=$GLOBAL_VERSION \
 --env HOST_FILE=$HOST_FILE \
+ $SET_DEBUG_MODE \
+ $DOCKER_REGISTRY_ENVS \
 $DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
 
 DEBUG=1
@@ -100,7 +124,9 @@ add_json_target(){
             TASK="upgrade-$TASK_NAME"
         fi
 
-        install -m 664 -g 65534 /dev/null $SHARED/output/$TASK.json
+        if [ ! -f $SHARED/output/$TASK.json ]; then
+            install -m 664 -g 65534 /dev/null $SHARED/output/$TASK.json
+        fi
         echo $JSON_TARGET | base64 -d >$SHARED/output/$TASK.json
 }
 
@@ -116,20 +142,38 @@ generate_backup_server_secrets () {
 
         echo '{ 
             "backupserver":{
+                "SSH_HOST":"'$SSH_HOST'",
                 "SSH_USER":"'$SSH_USER'",
                 "SSH_PORT":"'$SSH_PORT'",
                 "SSH_PASSWORD":"'$SSH_PASSWORD'",
-                "PASSWORD":"'$PASSWORD'",
+                "BACKUP_PASSWORD":"'$BACKUP_PASSWORD'",
                 "PERIOD":"'$PERIOD'",
                 "COMPRESSION":"'$COMPRESSION'",
                 "DIRECTORIES":"'$DIRECTORIES'",
-                "SERVICES":"'$SERVICES'",
+                "SERVICES":"'$SERVICES'"
-                "BACKUP_LOCAL_CLIENTS":"'$BACKUP_LOCAL_CLIENTS'",
-                "BACKUP_VPN_CLIENTS":"'$BACKUP_VPN_CLIENTS'"
             }
         }' | jq -r . > $SECRET_DIR/backup/server/backup.json
 }
 
+defaulting_missing_paramaters() {
+
+    if [ "$SSH_HOST" == "" ] || [ "$SSH_HOST" == "null" ]; then
+        SSH_HOST="localhost"
+    fi
+
+    if [ "$SSH_PORT" == "" ] || [ "$SSH_PORT" == "null" ]; then
+        SSH_PORT="20022"
+    fi
+
+    if [ "$SSH_USER" == "" ] || [ "$SSH_USER" == "null" ]; then
+        SSH_USER="backup"
+    fi
+
+    if [ "$SSH_PASSWORD" == "" ] || [ "$SSH_PASSWORD" == "null" ]; then
+        SSH_PASSWORD="backup"
+    fi
+}
+
 create_backup_service () {
 
     ADDITIONAL=""
@@ -198,22 +242,22 @@ create_backup_service () {
 
 backup_set_service() {
 
-
+    local BACKUP_PASSWORD="$1"
-    local PASSWORD="$1"
     local PERIOD="$2"
     local COMPRESSION="$3"
 
     local PLANNED_TIME="$(echo "$4" | base64 -d)"
     local DIRECTRIES="$5"
     local SERVICES="$6"
-    local BACKUP_LOCAL_CLIENTS="$7"
+    local SSH_HOST="$7"
-    local BACKUP_VPN_CLIENTS="$8"
 
-    local VPN="$9"
+    local VPN="$8"
-    local SSH_PORT="${10:-20022}"
+    local SSH_PORT="$9"
-    local SSH_USER="${11:-"backup"}"
+    local SSH_USER="${10}"
-    local SSH_PASSWORD="${12:-"backup"}"
+    local SSH_PASSWORD="${11}"
-    local OPERATION="${13}"
+    local OPERATION="${12}"
+
+    defaulting_missing_paramaters
 
     if [ "$OPERATION" == "DELETE" ]; then
 
@@ -267,12 +311,14 @@ backup_set_client() {
     local NAME="$1"
     local SIZE="$2"
     local VPN="$3"
-    local SSH_PORT="${4:-20022}"
+    local SSH_PORT="$4"
-    local SSH_USER="${5:-"backup"}"
+    local SSH_USER="$5"
-    local SSH_PASSWORD="${6:-"backup"}"
+    local SSH_PASSWORD="$6"
     local OPERATION="$7"
     local VPN_KEY="$8"
 
+    defaulting_missing_paramaters
+
     if [ "$OPERATION" == "DELETE" ]; then
         # delete service
         if [ -f "/etc/user/config/services/service-backup-client-$NAME.json" ]; then
@@ -300,7 +346,7 @@ backup_set_client() {
 
         ADDITIONAL=""
         ADDITIONAL='"EXTRA":"--restart=always","PRE_START":[],"DEPEND":[],"CMD": ""'
-        ENVS='"ENVS": [{"SSH_USER":"'$SSH_USER'"},{"SSH_PORT":"'$SSH_PORT'"},{"SSH_PASSWORD":"'$SSH_PASSWORD'"},{"VPN_CLIENT_KEY":"'$VPN_KEY'"}],'
+        ENVS='"ENVS":[{"SSH_USER":"'$SSH_USER'"},{"SSH_PORT":"'$SSH_PORT'"},{"SSH_PASSWORD":"'$SSH_PASSWORD'"},{"VPN_CLIENT_KEY":"'$VPN_KEY'"}],'
 
         echo '{
     "main": {
@@ -343,6 +389,7 @@ backup_set_client() {
         {
         "SOURCE": "/etc/user/data/backup/clients/'$NAME'/ssh",                   
         "DEST": "/home/'$SSH_USER'/.ssh",
+        "TYPE": "rw"
         }
             ],
     "POST_START": []
@@ -522,7 +569,8 @@ get_repositories() {
             GIT_HTTP_CONNECT_TIMEOUT=10 GIT_HTTP_TIMEOUT=30 git clone $REPO /tmp/$BASE >/dev/null
         else
             cd /tmp/$BASE
-            GIT_HTTP_CONNECT_TIMEOUT=10 GIT_HTTP_TIMEOUT=30 git pull >/dev/null
+	    date >> /tmp/pull.log
+            GIT_HTTP_CONNECT_TIMEOUT=10 GIT_HTTP_TIMEOUT=30 git pull >> /tmp/pull.log
         fi
         if [ -f "/tmp/$BASE/applications-tree.json" ]; then
             TREES=$TREES" /tmp/$BASE/applications-tree.json"
@@ -538,6 +586,9 @@ check_volumes() {
     if [ ! -d "/var/tmp/shared" ]; then
         /usr/bin/docker volume create SHARED
         RET=0
+    else
+        rm -rf /var/tmp/shared/input/*
+        rm -rf /var/tmp/shared/output/*
     fi
 
     if [ ! -d "/etc/system/data/" ]; then
@@ -866,14 +917,6 @@ upgrade_scheduler() {
     debug "Upgrading framework scheduler..."
     /usr/bin/docker pull "$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
 
-    if [ "$DEBUG_MODE" == "true" ]; then
-        DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'"
-        SET_DEBUG_MODE="--env DEBUG_MODE=true"
-    else
-        DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
-        SET_DEBUG_MODE=""
-    fi
-
     FRAMEWORK_SCHEDULER_NAME="$FRAMEWORK_SCHEDULER_NAME-$(head /dev/urandom | tr -dc '0-9' | head -c 6)"
 
     DOCKER_RUN="/usr/bin/docker run -d \
@@ -887,12 +930,14 @@ upgrade_scheduler() {
 		-v USER_SECRET:/etc/user/secret \
 		--restart=always \
         --name $FRAMEWORK_SCHEDULER_NAME \
+        $DOCKER_REGISTRY_ENVS \
         $SET_DEBUG_MODE \
 	  	--env WEBSERVER_PORT=$WEBSERVER_PORT \
 	  	--network $FRAMEWORK_SCHEDULER_NETWORK \
 		--env RUN_FORCE=$RUN_FORCE \
 		--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
 	  $DOCKER_START"
+    echo "DOCKER RUN: $DOCKER_RUN"
     eval "$DOCKER_RUN"
 }
 
@@ -1296,7 +1341,7 @@ execute_task() {
 
         elif [ "$TASK_TYPE" == "backup_set_service" ]; then
 
-            PASSWORD="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_SERVER_PASSWORD')"
+            BACKUP_PASSWORD="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_SERVER_PASSWORD')"
             PERIOD="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_PERIOD')"
             COMPRESSION="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_COMPRESSION')"
             PLANNED_TIME="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_PLANNED_TIME')"
@@ -1305,13 +1350,14 @@ execute_task() {
             BACKUP_LOCAL_CLIENTS="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_LOCAL_CLIENTS')"
             BACKUP_VPN_CLIENTS="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_VPN_CLIENTS')"
             VPN="$(echo $B64_JSON | base64 -d | jq -r '.VPN')"
+            SSH_HOST="$(echo $B64_JSON | base64 -d | jq -r '.SSH_HOST')"
             SSH_PORT="$(echo $B64_JSON | base64 -d | jq -r '.SSH_PORT')"
             SSH_USER="$(echo $B64_JSON | base64 -d | jq -r '.SSH_USER')"
             SSH_PASSWORD="$(echo $B64_JSON | base64 -d | jq -r '.SSH_PASSWORD')"
             OPERATION="$(echo $B64_JSON | base64 -d | jq -r '.OPERATION')"
 
             echo "task type is backup_set_service"
-            backup_set_service "$PASSWORD" "$PERIOD" "$COMPRESSION" "$PLANNED_TIME" "$DIRECTRIES" "$SERVICES" "$BACKUP_LOCAL_CLIENTS" "$BACKUP_VPN_CLIENTS" "$VPN" "$SSH_PORT" "$SSH_USER" "$SSH_PASSWORD" "$OPERATION"
+            backup_set_service "$BACKUP_PASSWORD" "$PERIOD" "$COMPRESSION" "$PLANNED_TIME" "$DIRECTRIES" "$SERVICES" "$SSH_HOST" "$VPN" "$SSH_PORT" "$SSH_USER" "$SSH_PASSWORD" "$OPERATION"
 
         elif [ "$TASK_TYPE" == "backup_set_client" ]; then
             
@@ -1343,24 +1389,21 @@ execute_task() {
         JSON="$(echo $B64_JSON | base64 -d)"
         NAME=$(echo "$JSON" | jq -r .NAME | awk '{print tolower($0)}')
         if [ "$NAME" == "framework" ]; then
-            JSON_TARGET=$(echo '{"DATE":"'$DATE'","INSTALL_STATUS":0}' | jq -r . | base64 -w0)
+            JSON_TARGET=$(echo '{"DATE":"'$DATE'","STATUS":1}' | jq -r . | base64 -w0)
             add_json_target $NAME
             echo "Upgrading service: webserver"
             upgrade webserver
 
             echo "Upgrading framework scheduler..."
-            echo "Cleaning temporary files..."
-            
-            rm -rf /var/tmp/shared/input/*
-            rm -rf /var/tmp/shared/output/*
-
             upgrade_scheduler
             echo "Removing old framework scheduler container..."
-            JSON_TARGET=$(echo '{"DATE":"'$DATE'","INSTALL_STATUS":1,"VERSION":'$VERSION'}' | jq -r . | base64 -w0)
+            JSON_TARGET=$(echo '{"DATE":"'$DATE'","STATUS":2,"VERSION":"'$VERSION'"}' | jq -r . | base64 -w0)
             add_json_target $NAME
             sleep 1
             /usr/bin/docker rm -f $HOSTNAME
 
+            JSON_TARGET="" # do not create upgrade.json
+
             #CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -E 'framework-scheduler|webserver')
         else
             echo "Upgrading service: $NAME"
@@ -1371,9 +1414,9 @@ execute_task() {
         sh /scripts/check_pid.sh "$PID" "$SHARED" "$TASK_NAME-$NAME" "$DATE" "$DEBUG" &
     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
         add_json_target
@@ -1485,7 +1528,7 @@ fi
 #RS=$(docker ps | grep redis-server)
 WS=$(/usr/bin/docker ps | grep -o webserver)
 
-if [ "$WS" == "" ]; then
+if [ "$WS" == "" ] && [ ! -f $SHARED/output/upgrade-framework.json ]; then
     # START SERVICES
     echo "Starting webserver"
     $service_exec service-framework.containers.webserver start &