Bump version to 1.1.5 in entrypoint script

scripts/scheduler/backup_challenge_clients.sh

@@ -0,0 +1,89 @@
+# Get MY IP
+
+# Get VPN network if exists
+
+# Define port
+
+# Define local IP range
+
+# Define VPN IP range
+
+# Store results
+
+
+scan_network(){
+        MyIP=$(ifconfig ${Interface}|grep inet |awk '{ print $2 }');
+        TargetIP=$(echo $MyIP|cut -d . -f1-3);
+        X=0
+	OpenIP=""
+        for i in $(seq 1 255); do
+                nc -w 1 -z $TargetIP.$i 60022;
+                if [ $? -eq 0 ]
+                then
+			if [ $MyIP != $TargetIP.$i ]
+                        then
+                                if [ $X = 1 ]
+                                then
+                                        # tobb nyitott IP
+					echo "Found more than one IP addresses"
+                                        echo "MAILKULDES"
+					echo "">OpenIP.txt;
+					# TODO mailkuldes ahova kell
+					exit 1;
+				else
+					OpenIP=$TargetIP.$i;
+                                fi
+				X=1;
+                        fi
+                fi
+	done
+	if [ $X = 1  ]
+	then
+		echo $OpenIP>OpenIP.txt;
+		echo "start LVM SYNC";
+		echo "OpenIP mukodik = "$OpenIP;
+		lvm_sync_create $OpenIP;
+	else
+		echo "No available local IP address found!"
+		try_target_VPN;
+	fi
+
+
+}
+
+try_target_IP(){
+	MyIP=$(ifconfig ${Interface}|grep inet |awk '{ print $2 }');
+ 	nc -w 1 -z $OpenIP 60022;
+        if [ $? -eq 0 ] 
+                then
+			if [ $MyIP = $OpenIP ]
+				then	
+				echo "Only own IP address found = "$OpenIP
+				scan_network;
+			fi
+	else
+	scan_network;
+	fi
+}
+
+try_target_VPN(){
+	nc -w 1 -z $VPN 60022;
+        if [ $? -eq 0 ]
+		then
+		for i in {0..99}; do
+		MyVPN=$(ifconfig tun$i 2>/dev/null |grep inet |awk '{ print $2 }');
+			echo "My VPN="$MyVPN;
+			echo "Found VPN="$VPN;
+			if [ $VPN != $MyVPN ]
+				then
+				echo "VPN accessible="$VPN;
+				lvm_sync_create $VPN;
+					else
+					echo "Only own VPN accessible="$VPN;
+					exit 1;
+			fi
+		done
+		else
+		echo "No available server"
+	fi
+}

scripts/scheduler/entrypoint.sh

@@ -3,8 +3,23 @@
 cd /scripts
 DEBUG_MODE=${DEBUG_MODE:-false}
 
+VERSION="1.1.5"
+
 #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}
@@ -19,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}
@@ -80,6 +103,9 @@ $VOLUME_MOUNTS \
 --env SETUP_VERSION=$SETUP_VERSION \
 --env GLOBAL_VERSION=$GLOBAL_VERSION \
 --env HOST_FILE=$HOST_FILE \
+-w /etc/user/config/services/ \
+ $SET_DEBUG_MODE \
+ $DOCKER_REGISTRY_ENVS \
 $DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
 
 DEBUG=1
@@ -91,14 +117,305 @@ debug() {
     fi
 }
 
-## Start prevously deployed firewall rules depend on framework scheduler startup at first time
+add_json_target(){
 
-if [ -d /etc/user/config/services ]; then
-    cd /etc/user/config/services
-    for FIREWALL in $(ls firewall*.json); do
-        $service_exec $FIREWALL start &
-    done
-fi
+        local TASK_NAME=$1
+
+        if [ -n "$TASK_NAME" ]; then
+            TASK="upgrade-$TASK_NAME"
+        fi
+
+        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
+}
+
+backup_query_state() {
+
+    echo "backup_query_state"
+
+}
+
+generate_backup_server_secrets () {
+
+        mkdir -p $SECRET_DIR/backup/server
+
+        echo '{ 
+            "backupserver":{
+                "SSH_HOST":"'$SSH_HOST'",
+                "SSH_USER":"'$SSH_USER'",
+                "SSH_PORT":"'$SSH_PORT'",
+                "SSH_PASSWORD":"'$SSH_PASSWORD'",
+                "BACKUP_PASSWORD":"'$BACKUP_PASSWORD'",
+                "PERIOD":"'$PERIOD'",
+                "COMPRESSION":"'$COMPRESSION'",
+                "DIRECTORIES":"'$DIRECTORIES'",
+                "SERVICES":"'$SERVICES'"
+            }
+        }' | 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=""
+        ADDITIONAL='"EXTRA":"--rm","PRE_START":[],"DEPEND": [],"CMD":""'
+
+        BACKUP_SERVER='{
+    "main": {
+    "SERVICE_NAME": "backup-server"
+    },
+    "containers": [
+    {
+    "IMAGE": "alpine:latest",
+    "NAME": "backup-init",
+    "NETWORK": "host",
+    "UPDATE": "true",
+    "MEMORY": "64M",
+    "EXTRA": "--rm",
+    "VOLUMES":[
+        {
+        "SOURCE": "USER_DATA",
+        "DEST": "/etc/user/data/",
+        "TYPE": "rw"
+        }
+            ],
+    "ENTRYPOINT": "sh -c",
+    "CMD": "mkdir -p /etc/user/data/backup/server/ssh",
+    "POST_START": []
+    },
+    {
+    "IMAGE": "safebox/backup-server:latest",
+    "NAME": "backupserver",
+    "NETWORK": "'$NETWORK'",
+    "UPDATE": "true",
+    "MEMORY": "64M",
+    "VOLUMES":[
+        {
+        "SOURCE": "USER_DATA",
+        "DEST": "/etc/user/data/",
+        "TYPE": "ro"
+        },
+        {
+        "SOURCE": "USER_CONFIG",
+        "DEST": "/etc/user/config/",
+        "TYPE": "ro"
+        },
+        {
+        "SOURCE": "USER_SECRET",
+        "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',
+    "POST_START": []
+        }
+    ]
+ }' 
+    # create backup server secrets from variables
+    generate_backup_server_secrets
+}
+
+backup_set_service() {
+
+    local BACKUP_PASSWORD="$1"
+    local PERIOD="$2"
+    local COMPRESSION="$3"
+
+    local PLANNED_TIME="$(echo "$4" | base64 -d)"
+    local DIRECTRIES="$5"
+    local SERVICES="$6"
+    local SSH_HOST="$7"
+
+    local VPN="$8"
+    local SSH_PORT="$9"
+    local SSH_USER="${10}"
+    local SSH_PASSWORD="${11}"
+    local OPERATION="${12}"
+
+    defaulting_missing_paramaters
+
+    if [ "$OPERATION" == "DELETE" ]; then
+
+        sed -i '/service-backup/d' /etc/user/data/cron/crontab.txt
+        # delete service
+        rm -f /etc/user/config/services/service-backup-server*
+        rm -rf /etc/user/data/backup/server
+        rm -rf /etc/user/secret/backup/server
+        debug "Service backup server service deleted."
+
+    elif [ "$OPERATION" == "MODIFY" ]; then
+
+        # modify only secrets for backup server, it will be affected at the next cron job
+        generate_backup_server_secrets
+
+    else
+
+        if [ -z "$SSH_PORT" ] ; then
+            SSH_PORT=20022
+        fi
+
+        if [ "$VPN" == "true" ]; then
+            NETWORK=$VPN_NETWORK
+            create_backup_service
+        else
+            NETWORK="host"
+            create_backup_service
+        fi
+    
+    fi
+
+    if [ -n "$PLANNED_TIME" ]; then
+        if [ "$VPN" == "true" ]; then
+            if [ -n "$BACKUP_SERVER" ] ; then
+                echo "$BACKUP_SERVER" | jq -r . >/etc/user/config/services/service-backup-server-vpn.json
+            fi
+            echo "'$PLANNED_TIME' service service-backup-server-vpn" >> /etc/user/data/cron/crontab.txt 
+        else
+            if [ -n "$BACKUP_SERVER" ] ; then
+             echo "$BACKUP_SERVER" | jq -r . >/etc/user/config/services/service-backup-server-local.json
+            fi
+            echo "'$PLANNED_TIME' service service-backup-server-local" >> /etc/user/data/cron/crontab.txt 
+        fi
+    fi    
+
+
+}
+
+backup_set_client() {
+
+    local NAME="$1"
+    local SIZE="$2"
+    local VPN="$3"
+    local SSH_PORT="$4"
+    local SSH_USER="$5"
+    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
+
+            debug "service-backup-client-$NAME.json stop force dns-remove"
+            $service_exec service-backup-client-$NAME.json stop force dns-remove
+            rm -f /etc/user/config/services/service-backup-client-$NAME.json
+            debug "Service backup client $NAME deleted."
+
+        fi
+
+    else
+
+        if [ -z "$SSH_PORT" ] ; then
+            SSH_PORT=20022
+        fi
+
+        if [ "$VPN" == "true" ]; then
+            NETWORK=$NAME
+            PORT='"PORTS": [{"SOURCE":"null","DEST":"'$SSH_PORT'","TYPE":"tcp"}],'
+        else
+            NETWORK="host"
+            PORT='"PORTS": [{"SOURCE":"'$SSH_PORT'","DEST":"'$SSH_PORT'","TYPE":"tcp"}],'
+        fi
+
+        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'"}],'
+
+        echo '{
+    "main": {
+    "SERVICE_NAME": "'$NAME'"
+    },
+    "containers": [
+    {
+    "IMAGE": "alpine:latest",
+    "NAME": "'$NAME'-init",
+    "NETWORK": "host",
+    "UPDATE": "true",
+    "MEMORY": "64M",
+    "EXTRA": "--rm",
+    "VOLUMES":[
+        {
+        "SOURCE": "USER_DATA",
+        "DEST": "/etc/user/data/",
+        "TYPE": "rw"
+        }
+            ],
+    "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'",
+    "POST_START": []
+    },
+    {
+    "IMAGE": "safebox/backup-client:latest",
+    "NAME": "'$NAME'",
+    "UPDATE": "true",
+    "MEMORY": "64M",
+    "NETWORK": "'$NETWORK'",
+    '$ADDITIONAL',
+    '$ENVS'
+    '$PORT'
+    "VOLUMES":[
+        { 
+        "SOURCE": "/etc/user/data/backup/clients/'$NAME'/backup",
+        "DEST": "/home/'$SSH_USER'/backup",
+        "TYPE": "rw"                   
+        },                       
+        {
+        "SOURCE": "/etc/user/data/backup/clients/'$NAME'/ssh",                   
+        "DEST": "/home/'$SSH_USER'/.ssh",
+        "TYPE": "rw"
+        }
+            ],
+    "POST_START": []
+        }
+    ]
+ }' | jq -r . >/etc/user/config/services/service-backup-client-$NAME.json
+
+        debug "service-backup-client-$NAME.json start info"
+        $service_exec service-backup-client-$NAME.json start info &
+
+    fi
+
+}
+
+backup_challenge_clients() {
+
+    echo "backup_challenge_clients"
+
+}
+
+restore_from_backup() {
+
+    echo "restore_from_backup"
+
+}
 
 create_htpasswd_file() {
 
@@ -241,6 +558,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
 
@@ -249,7 +570,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"
@@ -265,6 +587,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
@@ -575,7 +900,7 @@ check_update() {
         debug "$REMOTE_URL not accessible, http error code: $CURL_CHECK_CODE"
 
         echo "Force image pull has started without digest check..."
-        DOCKER_PULL="docker pull $IMAGE"
+        DOCKER_PULL="/usr/bin/docker pull $IMAGE"
         eval $DOCKER_PULL
         STATUS=$?
         debug "PULL STATUS: $STATUS"
@@ -589,9 +914,14 @@ check_update() {
 
 upgrade_scheduler() {
 
-    DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c '/scripts/upgrade.sh'"
+    # Upgrading framework scheduler
+    debug "Upgrading framework scheduler..."
+    /usr/bin/docker pull "$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
+
+    FRAMEWORK_SCHEDULER_NAME="$FRAMEWORK_SCHEDULER_NAME-$(head /dev/urandom | tr -dc '0-9' | head -c 6)"
 
     DOCKER_RUN="/usr/bin/docker run -d \
+        -w /etc/user/config/services/ \
         -v SHARED:/var/tmp/shared \
 	  	-v /var/run/docker.sock:/var/run/docker.sock \
 		-v SYSTEM_DATA:/etc/system/data \
@@ -601,31 +931,38 @@ upgrade_scheduler() {
 		-v USER_CONFIG:/etc/user/config \
 		-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"
 }
 
 upgrade() {
     local NAME=$1
 
-    if [ "$NAME" == "web-installer" ]; then
-
-        debug "$service_exec service-framework.containers.webserver stop force"
-        $service_exec service-framework.containers.webserver stop force
-        debug "$service_exec service-framework.containers.webserver start info"
-        $service_exec service-framework.containers.webserver start info &
-
+    if [ "$NAME" == "webserver" ]; then
+        debug "$service_exec service-framework.containers.$NAME stop force"
+        $service_exec service-framework.containers.$NAME stop force
+        debug "$service_exec service-framework.containers.$NAME start info"
+        $service_exec service-framework.containers.$NAME start info &
     else
+        if ! echo "$NAME" | grep -q '\.'; then
+        NAME="$NAME.json"
+        fi
+        
+        debug "$service_exec $NAME stop force"
+        $service_exec $NAME stop force
+        debug "$service_exec $NAME start info"
+        $service_exec $NAME start info &
 
-        debug "$service_exec $NAME.json stop force"
-        $service_exec $NAME.json stop force
-        debug "$service_exec $NAME.json start info"
-        $service_exec $NAME.json start info &
     fi
+
     PID=$!
 }
 
@@ -668,14 +1005,19 @@ execute_task() {
 
             if [ "$REQUEST" == "requested" ]; then
                 echo "New certificate for $DOMAIN is requested."
-                touch /etc/system/data/ssl/keys/$DOMAIN/new_certificate
+                echo "Modifying $DOMAIN_FILE.json for $DOMAIN"
+                jq '.containers[0].ENVS |= map(if has("OPERATION") then .OPERATION = "MODIFY" else . end) | \
+                .containers[0].ENVS |= map(if has("DOMAIN") then .DOMAIN = "'$DOMAIN'" else . end)' \
+                /etc/user/config/services/$DOMAIN_FILE.json > /tmp/$DOMAIN_FILE.json && \
+                mv /tmp/$DOMAIN_FILE.json /etc/user/config/services/$DOMAIN_FILE.json
+                debug "$service_exec $DOMAIN_FILE.json start info"
+                $service_exec $DOMAIN_FILE.json start info &
             fi
         done
         JSON_TARGET=$B64_JSON
 
     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 letsencrypt.json local-loadbalancer.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
@@ -715,7 +1057,7 @@ execute_task() {
         JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "INSTALL_STATUS": "'$INSTALL_STATUS'", "INSTALLED_SERVICES": {'$SERVICES'} }' | jq -r . | base64 -w0)
 
     elif [ "$TASK_NAME" == "services" ]; then
-        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 letsencrypt.json local-loadbalancer.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
@@ -798,10 +1140,12 @@ execute_task() {
     elif [ "$TASK_NAME" == "deployments" ]; then
         DEPLOYMENTS=""
         TREES=$(get_repositories)
-        for TREE in $TREES; do
+        for TREE in "$TREES"; do
             APPS=$(jq -rc '.apps[]' $TREE)
-            for APP in $APPS; do
+            #for APP in "$APPS"; do #space problem
+            while IFS= read -r APP; do
                 APP_NAME=$(echo "$APP" | jq -r '.name')
+                APP_SUBTITLE="$(echo "$APP" | jq -r '.subtitle')"
                 APP_VERSION=$(echo "$APP" | jq -r '.version')
                 APP_ICON=$(echo "$APP" | jq -r '.icon')
                 if [ "$DEPLOYMENTS" != "" ]; then
@@ -809,8 +1153,8 @@ execute_task() {
                 else
                     SEP=""
                 fi
-                DEPLOYMENTS=$DEPLOYMENTS$SEP'"'$APP_NAME'": {"version": "'$APP_VERSION'", "icon": "'$APP_ICON'"}'
-            done
+                DEPLOYMENTS="$DEPLOYMENTS"$SEP'"'$APP_NAME'":{"subtitle":"'"$APP_SUBTITLE"'","version":"'"$APP_VERSION"'","icon":"'"$APP_ICON"'"}'
+            done < <(echo "$APPS") # preserve DEPLOYMENTS variable
         done
         if [ "$DEPLOYMENTS" == "" ]; then
             DEPLOYMENTS='"deployments": "NONE"'
@@ -844,20 +1188,22 @@ execute_task() {
 
         for TREE in $TREES; do
             APPS=$(jq -rc '.apps[]' $TREE)
-            for APP in $APPS; do
+            #for APP in $APPS; do
+            while IFS= read -r APP; do
                 APP_NAME=$(echo "$APP" | jq -r '.name' | awk '{print tolower($0)}')
+                APP_SUBTITLE=$(echo "$APP" | jq -r '.subtitle')
                 APP_VERSION=$(echo "$APP" | jq -r '.version')
                 APP_DIR=$(dirname $TREE)"/"$APP_NAME
-                debug "$APP_TEMPLATE"
                 if [ "$APP_NAME" == "$DEPLOY_NAME" ]; then
                     if [ "$DEPLOY_ACTION" == "ask" ]; then
                         APP_TEMPLATE=$APP_DIR"/template.json"
                         TEMPLATE=$(cat $APP_TEMPLATE | base64 -w0)
-                        JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "TEMPLATE": "'$TEMPLATE'" }' | jq -r . | base64 -w0)
+                        debug "$APP_TEMPLATE"
+                        JSON_TARGET=$(echo '{"DATE":"'$DATE'","STATUS": "0","TEMPLATE":"'$TEMPLATE'"}' | jq -r . | base64 -w0)
                     elif [ "$DEPLOY_ACTION" == "reinstall" ]; then
                         APP_TEMPLATE=$APP_DIR"/template.json"
                         TEMPLATE=$(cat $APP_TEMPLATE)
-                        for LINE in $(cat $SERVICE_DIR/service-$DEPLOY_NAME.json | jq -rc '.containers[].ENVS[] | to_entries[]'); do
+                        for LINE in $(cat $SERVICE_DIR/service-$DEPLOY_NAME.json | jq -rc '.containers[].ENVS[] | to_entries[]' 2>/dev/null); do
                             KEY=$(echo $LINE | jq -r .key)
                             VALUE=$(echo $LINE | jq -r .value)
                             debug "$KEY: $VALUE"
@@ -866,14 +1212,14 @@ execute_task() {
                             TEMPLATE=$(echo "$TEMPLATE" | jq -r '.fields |= map(if .key == "'$KEY'" then .value = "'$VALUE'" else . end)')
                         done
                         # write ENV value from domain file to template value by key name
-                        for LINE in $(cat $SERVICE_DIR/domain-$DEPLOY_NAME.json | jq -rc '.containers[].ENVS[] | to_entries[]'); do
+                        for LINE in $(cat $SERVICE_DIR/domain-$DEPLOY_NAME.json | jq -rc '.containers[].ENVS[] | to_entries[]' 2>/dev/null); do
                             KEY=$(echo $LINE | jq -r .key)
                             VALUE=$(echo $LINE | jq -r .value)
                             debug "$KEY: $VALUE"
                             TEMPLATE=$(echo "$TEMPLATE" | jq -r '.fields |= map(if .key == "'$KEY'" then .value = "'$VALUE'" else . end)')
                         done
                         # write ENV value from secret file to template value by key name
-                        for LINE in $(cat $SECRET_DIR/$DEPLOY_NAME/$DEPLOY_NAME.json | jq -rc '.[] | to_entries[]'); do
+                        for LINE in $(cat $SECRET_DIR/$DEPLOY_NAME/$DEPLOY_NAME.json | jq -rc '.[] | to_entries[]' 2>/dev/null); do
                             KEY=$(echo $LINE | jq -r .key)
                             VALUE=$(echo $LINE | jq -r .value)
                             debug "$KEY: $VALUE"
@@ -901,7 +1247,7 @@ execute_task() {
                         sh /scripts/check_pid.sh "$PID" "$SHARED" "deploy-$DEPLOY_NAME" "$DATE" "$DEBUG" &
 
                     elif [ "$DEPLOY_ACTION" == "edit" ]; then
-
+                        JSON_TARGET=""
                         DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON
 
                         # stop service before edit
@@ -920,7 +1266,7 @@ execute_task() {
                         JSON_TARGET=""
                     fi
                 fi
-            done
+            done < <(echo "$APPS") # preserve variables
         done
 
     elif [ "$TASK_NAME" == "repositories" ]; then
@@ -947,20 +1293,25 @@ execute_task() {
 
         VPN_STATUS="0"
         VPN_RESULT=""
-        CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -w wireguardproxy)
-        if [ "$CONTAINERS" != "" ]; then
-            UP=$(echo $CONTAINERS | grep -w 'Up')
-            if [ "$UP" != "" ]; then
-                VPN_STATUS="2"
-            else
-                VPN_STATUS="1"
+        if [ -f $SECRET_DIR/vpn-proxy/wg0.conf ]; then
+            CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -w wireguardproxy)
+            if [ "$CONTAINERS" != "" ]; then
+                UP=$(echo $CONTAINERS | grep -w 'Up')
+                if [ "$UP" != "" ]; then
+                    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)
 
     elif [ "$TASK_NAME" == "save_vpn" ]; then
 
+        JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "RESULT": "" }' | jq -r . | base64 -w0)
+        add_json_target
+
         VPN_PROXY_REPO="wireguard-proxy-client"
         if [ ! -d "/tmp/$VPN_PROXY_REPO" ]; then
             git clone https://git.format.hu/safebox/$VPN_PROXY_REPO.git /tmp/$VPN_PROXY_REPO >/dev/null
@@ -978,21 +1329,88 @@ execute_task() {
         # install vpn only
         sh /scripts/install.sh "$B64_JSON" "$service_exec" "vpn" "$GLOBAL_VERSION"
 
-        JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "'$VPN_STATUS'", "RESULT": "'$VPN_RESULT'" }' | jq -r . | base64 -w0)
+        JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1", "RESULT": "'$VPN_RESULT'" }' | jq -r . | base64 -w0)
 
     elif [ "$TASK_NAME" == "containers" ]; then # not in use
         CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -v framework-scheduler)
         RESULT=$(echo "$CONTAINERS" | base64 -w0)
         JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "RESULT": "'$RESULT'" }' | jq -r . | base64 -w0)
 
+    elif [ "$TASK_NAME" == "backup" ]; then
+
+        TASK_TYPE=$(echo $B64_JSON | base64 -d | jq -r '.TASK_TYPE')
+
+        if [ "$TASK_TYPE" == "backup_query_state" ]; then
+            echo "task type is backup_query_state"
+
+        elif [ "$TASK_TYPE" == "backup_set_service" ]; then
+
+            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')"
+            DIRECTRIES="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_DIRECTORIES')"
+            SERVICES="$(echo $B64_JSON | base64 -d | jq -r '.SERVICES')"
+            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 "$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
+            
+            NAME="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_CLIENT_NAME')"
+            SIZE="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_CLIENT_SIZE')"
+            VPN="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_CLIENT_VPN')"
+            SSH_PORT="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_CLIENT_SSH_PORT')"
+            SSH_USER="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_CLIENT_SSH_USER')"
+            SSH_PASSWORD="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_CLIENT_SSH_PASSWORD')"
+            OPERATION="$(echo $B64_JSON | base64 -d | jq -r '.BACKUP_CLIENT_OPERATION')"
+            
+            debug "task type is backup_set_client for $NAME"
+            backup_set_client "$NAME" "$SIZE" "$VPN" "$SSH_PORT" "$SSH_USER" "$SSH_PASSWORD" "$OPERATION"
+
+        elif [ "$TASK_TYPE" == "backup_challenge_clients" ]; then
+            echo "task type is backup_challenge_clients"
+
+        elif [ "$TASK_TYPE" == "restore_from_backup" ]; then
+            echo "task type is restore_from_backup"
+
+        else
+            echo "Unknown task type: $TASK_TYPE"
+        fi
+
+        RESULT=$(echo "$CONTAINERS" | base64 -w0)
+        JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "RESULT": "'$RESULT'" }' | jq -r . | base64 -w0)
+
     elif [ "$TASK_NAME" == "upgrade" ]; then
         JSON="$(echo $B64_JSON | base64 -d)"
         NAME=$(echo "$JSON" | jq -r .NAME | awk '{print tolower($0)}')
         if [ "$NAME" == "framework" ]; then
-            upgrade "web-installer"
+            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..."
             upgrade_scheduler
+            echo "Removing old framework scheduler container..."
+            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"
             upgrade "$NAME"
             #CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -w "$NAME")
         fi
@@ -1000,14 +1418,12 @@ execute_task() {
         sh /scripts/check_pid.sh "$PID" "$SHARED" "$TASK_NAME-$NAME" "$DATE" "$DEBUG" &
     fi
 
-    if [ "$TASK_NAME" != "check_vpn" ]; then
-        debug "JSON_TARGET: $JSON_TARGET"
-    fi
+#    if [ "$TASK_NAME" != "check_vpn" ]; then
+#        debug "JSON_TARGET: $JSON_TARGET"
+#    fi
 
     if [ "$JSON_TARGET" != "" ]; then
-        #redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
-        install -m 664 -g 65534 /dev/null $SHARED/output/$TASK.json
-        echo $JSON_TARGET | base64 -d >$SHARED/output/$TASK.json
+        add_json_target
     fi
 
 }
@@ -1077,39 +1493,15 @@ check_redis_availability() {
     done
 }
 
-start_framework_scheduler() {
-
-    if [ "$DEBUG_MODE" == "true" ]; then
-        DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'"
-    else
-        DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
-    fi
-    DOCKER_RUN="/usr/bin/docker run -d \
-        -v SHARED:/var/tmp/shared \
-	  	-v /var/run/docker.sock:/var/run/docker.sock \
-		-v SYSTEM_DATA:/etc/system/data \
-		-v SYSTEM_CONFIG:/etc/system/config \
-		-v SYSTEM_LOG:/etc/system/log \
-		-v USER_DATA:/etc/user/data \
-		-v USER_CONFIG:/etc/user/config \
-		-v USER_SECRET:/etc/user/secret \
-		--restart=always \
-		--name $FRAMEWORK_SCHEDULER_NAME \
-	  	--env WEBSERVER_PORT=$WEBSERVER_PORT \
-	  	--network $FRAMEWORK_SCHEDULER_NETWORK \
-		--env RUN_FORCE=$RUN_FORCE \
-		--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
-	  $DOCKER_START"
-    eval "$DOCKER_RUN"
-
-}
-
 ### SYSTEM INITIALIZATION ###
+## Start prevously deployed firewall rules depend on framework scheduler startup at first time
 
-## DOCKER NETWORK VARIABLES
-## FILESYSTEM VARIABLES
-## PORTS VARIABLES
-### RESTART SCHEDULER IF NEEDED
+if [ -d /etc/user/config/services ]; then
+    cd /etc/user/config/services
+    for FIREWALL in $(ls firewall*.json); do
+        $service_exec $FIREWALL start &
+    done
+fi
 
 SN=$(check_subnets)
 if [ "$SN" != "1" ]; then
@@ -1126,7 +1518,7 @@ fi
 
 VOL=$(check_volumes)
 if [ "$VOL" != "1" ]; then
-    start_framework_scheduler
+    upgrade_scheduler
     /usr/bin/docker rm -f $HOSTNAME
 fi
 
@@ -1138,15 +1530,12 @@ if [ "$DF" != "1" ]; then
 fi
 
 #RS=$(docker ps | grep redis-server)
-WS=$(docker ps | grep webserver)
-
-#if [[ "$WS" == "" && "$RS" == "" ]]; then
-if [ "$WS" == "" ]; then
+WS=$(/usr/bin/docker ps | grep -o webserver)
 
+if [ "$WS" == "" ] && [ ! -f $SHARED/output/upgrade-framework.json ]; then
     # START SERVICES
-    #$service_exec service-framework.containers.redis-server start &
+    echo "Starting webserver"
     $service_exec service-framework.containers.webserver start &
-    sleep 5
 
 fi
 
@@ -1158,7 +1547,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 |

scripts/scheduler/install.sh

@@ -200,14 +200,18 @@ elif [ "$FIRST_INSTALL" == "vpn" ]; then
 
     get_vpn_key
 
-    edit_user_json $LETSENCRYPT_MAIL $LETSENCRYPT_SERVERNAME
+    if [ "$VPN_PROXY" != "no" ]; then
 
-    $SERVICE_EXEC vpn-proxy stop force
-    $SERVICE_EXEC vpn-proxy start
-    echo "$INIT_SERVICE_PATH/vpn-proxy.json" >>$AUTO_START_SERVICES/.init_services
-    echo "$INIT_SERVICE_PATH/firewall-vpn-smarthost-loadbalancer" >>$AUTO_START_SERVICES/.init_services
-    echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-postrouting" >>$AUTO_START_SERVICES/.init_services
-    echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-prerouting" >>$AUTO_START_SERVICES/.init_services
+	    edit_user_json $LETSENCRYPT_MAIL $LETSENCRYPT_SERVERNAME
+
+	    $SERVICE_EXEC vpn-proxy stop force
+	    $SERVICE_EXEC vpn-proxy start
+	    echo "$INIT_SERVICE_PATH/vpn-proxy.json" >>$AUTO_START_SERVICES/.init_services
+	    echo "$INIT_SERVICE_PATH/firewall-vpn-smarthost-loadbalancer" >>$AUTO_START_SERVICES/.init_services
+	    echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-postrouting" >>$AUTO_START_SERVICES/.init_services
+	    echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-prerouting" >>$AUTO_START_SERVICES/.init_services
+
+    fi;
 
     exit
 
@@ -251,7 +255,7 @@ if [ "$INIT" == "true" ]; then
     if [ "$SMARTHOST_PROXY" == "yes" ]; then
         $SERVICE_EXEC smarthost-proxy start
         $SERVICE_EXEC smarthost-proxy-scheduler start
-        $SERVICE_EXEC local-proxy start
+        $SERVICE_EXEC local-loadbalancer start
 
         echo "$INIT_SERVICE_PATH/smarthost-proxy.json" >>$AUTO_START_SERVICES/.init_services
         echo "$INIT_SERVICE_PATH/firewall-smarthost-loadbalancer-dns.json" >>$AUTO_START_SERVICES/.init_services
@@ -260,7 +264,7 @@ if [ "$INIT" == "true" ]; then
         echo "$INIT_SERVICE_PATH/firewall-smarthost-backend-dns.json" >>$AUTO_START_SERVICES/.init_services
         echo "$INIT_SERVICE_PATH/firewall-smarthost-to-backend.json" >>$AUTO_START_SERVICES/.init_services
         echo "$INIT_SERVICE_PATH/smarthost-proxy-scheduler.json" >>$AUTO_START_SERVICES/.init_services
-        echo "$INIT_SERVICE_PATH/local-proxy.json" >>$AUTO_START_SERVICES/.init_services
+        echo "$INIT_SERVICE_PATH/local-loadbalancer.json" >>$AUTO_START_SERVICES/.init_services
 
         if [ "$LOCAL_BACKEND" == "yes" ]; then
             $SERVICE_EXEC local-backend start