Merge pull request #506 from jumpserver/dev

v4.5.0

compose/web.yml

@@ -12,13 +12,15 @@ services:
       USE_LB: ${USE_LB:-1}
       USE_IPV6: ${USE_IPV6:-0}
       USE_XPACK: ${USE_XPACK:-0}
+      GZIP: ${GZIP:-on}
       CLIENT_MAX_BODY_SIZE: ${CLIENT_MAX_BODY_SIZE:-4096m}
       CORE_ENABLED: ${CORE_ENABLED:-1}
       KOKO_ENABLED: ${KOKO_ENABLED:-1}
       LION_ENABLED: ${LION_ENABLED:-1}
       CHEN_ENABLED: ${CHEN_ENABLED:-1}
       KAEL_ENABLED: ${KAEL_ENABLED:-0}
       RAZOR_ENABLED: ${RAZOR_ENABLED:-1}
+      FACELIVE_ENABLED: ${FACELIVE_ENABLED:-0}
     ports:
       - ${HTTP_PORT:-80}:${HTTP_PORT:-80}
     volumes:

config_init/loki/promtail.yml

@@ -82,6 +82,24 @@ scrape_configs:
           job_name: magnus
           __path__: /data/jumpserver/magnus/data/logs/*.log
 
+  - job_name: nec
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          component: nec
+          job_name: nec
+          __path__: /data/jumpserver/nec/data/logs/*.log
+
+  - job_name: facelive
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          component: facelive
+          job_name: facelive
+          __path__: /data/jumpserver/facelive/data/logs/*.log
+
   - job_name: docker
     docker_sd_configs:
       - host: unix:///var/run/docker.sock
@@ -90,7 +108,8 @@ scrape_configs:
           - name: name
             values: [jms_web, jms_core, jms_koko, jms_lion,
                     jms_chen, jms_magnus, jms_xrdp, jms_razor,
-                     jms_receptor]
+                     jms_receptor, jms_nec, jms_facelive,
+                     ]
     relabel_configs:
       - source_labels: ["__meta_docker_container_name"]
         regex: "/(.*)"

scripts/const.sh

@@ -26,10 +26,10 @@ STATIC_ENV=${PROJECT_DIR}/static.env
 . "${STATIC_ENV}"
 
 export OS=$(uname -s)
-export DOCKER_VERSION=27.1.1
+export DOCKER_VERSION=27.4.0
 export DOCKER_MIRROR="https://download.jumpserver.org/docker/docker-ce/linux/static/stable"
 
-export DOCKER_COMPOSE_VERSION=v2.29.1
+export DOCKER_COMPOSE_VERSION=v2.31.0
 export DOCKER_COMPOSE_MIRROR="https://download.jumpserver.org/docker/compose/releases/download"
 
 ARCH=$(uname -m)

scripts/utils.sh

@@ -48,7 +48,7 @@ function has_config() {
 function get_config() {
   key=$1
   default=${2-''}
-  value=$(grep "^${key}=" "${CONFIG_FILE}" | awk -F= '{ print $2 }' | awk -F' ' '{ print $1 }')
+  value=$(grep "^${key}=" "${CONFIG_FILE}" | awk -F= '{ print $2 }' | awk -F' ' '{ print $1 }' | tail -1)
   if [[ -z "$value" ]];then
     value="$default"
   fi
@@ -475,11 +475,6 @@ function prepare_config() {
   if [[ ! -f "./compose/.env" ]]; then
     ln -s "${CONFIG_FILE}" ./compose/.env
   fi
-  if [[ "$(uname -m)" == "loongarch64" ]]; then
-    if ! grep -q "^SECURITY_LOGIN_CAPTCHA_ENABLED" "${CONFIG_FILE}"; then
-      echo "SECURITY_LOGIN_CAPTCHA_ENABLED=False" >> "${CONFIG_FILE}"
-    fi
-  fi
 
   # shellcheck disable=SC2045
   for d in $(ls "${PROJECT_DIR}/config_init"); do