Bump version to 1.1.5 in entrypoint script

scripts/scheduler/entrypoint.sh

@@ -3,7 +3,7 @@
 cd /scripts
 DEBUG_MODE=${DEBUG_MODE:-false}
 
-VERSION="1.1.4"
+VERSION="1.1.5"
 
 #DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
 DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-safebox}
@@ -103,6 +103,7 @@ $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"
@@ -920,6 +921,7 @@ upgrade_scheduler() {
     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 \
@@ -950,11 +952,14 @@ upgrade() {
         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.json stop force"
-        $service_exec $NAME.json stop force
-        debug "$service_exec $NAME.json start info"
-        $service_exec $NAME.json start info &
+        debug "$service_exec $NAME stop force"
+        $service_exec $NAME stop force
+        debug "$service_exec $NAME start info"
+        $service_exec $NAME start info &
 
     fi
 
@@ -1012,8 +1017,7 @@ execute_task() {
         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
@@ -1053,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

scripts/scheduler/install.sh

@@ -255,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
@@ -264,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